[RFC] gksu, libgksu: upgrade to 2.0
Boris Samorodov
bsam at ipt.ru
Fri Apr 15 15:26:37 UTC 2011
Hi List,
I created a patch based on PR/156401 to upgrade sysutils/gksu to 2.0.2
and upgrade sysutils/libgksu to 2.0.9. The port sysutils/libgksuui is
part of sysutils/libgksu and should be removed. The port
x11-toolkits/py-gnome-extras maintained bu gnome@ should be
changed too (a patch is included).
Comments, suggestions, etc. are welcomed. The patch:
-----
Index: sysutils/gksu/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/gksu/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- sysutils/gksu/Makefile 28 Mar 2010 06:43:45 -0000 1.22
+++ sysutils/gksu/Makefile 15 Apr 2011 11:36:13 -0000
@@ -6,25 +6,23 @@
#
PORTNAME= gksu
-PORTVERSION= 1.3.7
-PORTREVISION= 6
+PORTVERSION= 2.0.2
CATEGORIES= sysutils
-MASTER_SITES= http://people.debian.org/~kov/gksu/old_stuff/gksu/
+MASTER_SITES= http://people.debian.org/~kov/gksu/
MAINTAINER= bsam at FreeBSD.org
COMMENT= Graphical frontend to su
-LIB_DEPENDS= gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
- gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui \
+LIB_DEPENDS= gksu2:${PORTSDIR}/sysutils/libgksu \
+ nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus \
gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
USE_GNOME= gtk20 pkgconfig gnomeprefix gnomehack gconf2 intlhack
GNU_CONFIGURE= yes
+USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-GCONF_SCHEMAS= gksu.schemas
-MAN1= gksu.1 gksuexec.1
-MLINKS= gksu.1 gksudo.1
+MAN1= gksu.1
.include <bsd.port.mk>
Index: sysutils/gksu/distinfo
===================================================================
RCS file: /home/pcvs/ports/sysutils/gksu/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- sysutils/gksu/distinfo 19 Mar 2011 12:32:30 -0000 1.4
+++ sysutils/gksu/distinfo 15 Apr 2011 11:36:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (gksu-1.3.7.tar.gz) = 8e3b0a51bacbb7172246ae91d1e232863a2da0d8a9393a74de909d91211a6b6d
-SIZE (gksu-1.3.7.tar.gz) = 620451
+SHA256 (gksu-2.0.2.tar.gz) = a1de3dca039d88c195fcdc9516379439a1d699750417f1e655aa2101a955ee5a
+SIZE (gksu-2.0.2.tar.gz) = 468121
Index: sysutils/gksu/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/sysutils/gksu/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- sysutils/gksu/pkg-plist 24 Oct 2007 23:36:38 -0000 1.4
+++ sysutils/gksu/pkg-plist 15 Apr 2011 11:36:13 -0000
@@ -1,28 +1,12 @@
bin/gksu
bin/gksudo
-bin/gksuexec
+lib/nautilus/extensions-2.0/libnautilus-gksu.la
+lib/nautilus/extensions-2.0/libnautilus-gksu.so
+lib/nautilus/extensions-2.0/libnautilus-gksu.a
share/applications/gksu.desktop
-share/applications/gksuexec.desktop
share/pixmaps/gksu-icon.png
share/pixmaps/gksu-root-terminal.png
share/gksu/gksu-migrate-conf.sh
-share/locale/ca/LC_MESSAGES/gksu.mo
-share/locale/da/LC_MESSAGES/gksu.mo
-share/locale/de/LC_MESSAGES/gksu.mo
-share/locale/es/LC_MESSAGES/gksu.mo
-share/locale/pt_BR/LC_MESSAGES/gksu.mo
-share/locale/ru/LC_MESSAGES/gksu.mo
-share/locale/cs/LC_MESSAGES/gksu.mo
-share/locale/fr/LC_MESSAGES/gksu.mo
-share/locale/gl/LC_MESSAGES/gksu.mo
-share/locale/hu/LC_MESSAGES/gksu.mo
-share/locale/it/LC_MESSAGES/gksu.mo
-share/locale/nb/LC_MESSAGES/gksu.mo
-share/locale/nl/LC_MESSAGES/gksu.mo
-share/locale/pl/LC_MESSAGES/gksu.mo
-share/locale/pt/LC_MESSAGES/gksu.mo
-share/locale/ro/LC_MESSAGES/gksu.mo
-share/locale/sk/LC_MESSAGES/gksu.mo
-share/locale/xh/LC_MESSAGES/gksu.mo
+man/man1/gksudo.1
@dirrm share/gksu
@dirrmtry share/applications
Index: sysutils/gksu/files/patch-gksu_Makefile.in
===================================================================
RCS file: sysutils/gksu/files/patch-gksu_Makefile.in
diff -N sysutils/gksu/files/patch-gksu_Makefile.in
--- sysutils/gksu/files/patch-gksu_Makefile.in 14 Nov 2005 23:43:15 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
---- gksu/Makefile.in.orig Mon Nov 14 19:40:58 2005
-+++ gksu/Makefile.in Mon Nov 14 19:48:36 2005
-@@ -266,7 +266,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--AM_CFLAGS = -g -O2 -Wall
-+AM_CFLAGS = $(CFLAGS)
- INCLUDES = @GKSU_CFLAGS@
- AM_CPPFLAGS = -DLOCALEDIR=\"$(prefix)/share/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
- schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-@@ -577,18 +577,19 @@
- uninstall-am uninstall-binPROGRAMS uninstall-info-am \
- uninstall-schemasDATA
-
-- at INTLTOOL_SCHEMAS_RULE@
-+gksu.schemas:
-+ LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $@.in $@
-
- install-exec-hook:
- cd $(DESTDIR)$(bindir) && \
- $(LN_S) -f gksu gksudo
-
- @GCONF_SCHEMAS_INSTALL_TRUE at install-data-local:
-- at GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \
-- at GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \
-- at GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
-- at GCONF_SCHEMAS_INSTALL_TRUE@ done \
-- at GCONF_SCHEMAS_INSTALL_TRUE@ fi
-+ at GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \
-+ at GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \
-+ at GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
-+ at GCONF_SCHEMAS_INSTALL_TRUE@ done \
-+ at GCONF_SCHEMAS_INSTALL_TRUE@ fi
- @GCONF_SCHEMAS_INSTALL_FALSE at install-data-local:
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
Index: sysutils/gksu/files/patch-gksu_gksu.c
===================================================================
RCS file: sysutils/gksu/files/patch-gksu_gksu.c
diff -N sysutils/gksu/files/patch-gksu_gksu.c
--- sysutils/gksu/files/patch-gksu_gksu.c 22 May 2006 21:33:26 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,82 +0,0 @@
---- gksu/gksu.c.orig Wed Mar 29 06:18:28 2006
-+++ gksu/gksu.c Mon May 22 16:29:36 2006
-@@ -513,6 +513,7 @@
-
- pid_t test_lock(const char* fname)
- {
-+ struct flock fl;
- int FD = open(fname, 0);
- if(FD < 0) {
- if(errno == ENOENT) {
-@@ -523,7 +524,6 @@
- return(-1);
- }
- }
-- struct flock fl;
- fl.l_type = F_WRLCK;
- fl.l_whence = SEEK_SET;
- fl.l_start = 0;
-@@ -543,6 +543,7 @@
-
- int get_lock(const char *File)
- {
-+ struct flock fl;
- int FD = open(File,O_RDWR | O_CREAT | O_TRUNC,0640);
- if (FD < 0)
- {
-@@ -560,13 +561,13 @@
- fcntl(FD,F_SETFD, FD_CLOEXEC);
-
- // Aquire a write lock
-- struct flock fl;
- fl.l_type = F_WRLCK;
- fl.l_whence = SEEK_SET;
- fl.l_start = 0;
- fl.l_len = 0;
- if (fcntl(FD,F_SETLK,&fl) == -1)
- {
-+ int Tmp;
- if (errno == ENOLCK)
- {
- g_warning(_("Not using locking for nfs mounted lock file %s"), File);
-@@ -575,7 +576,7 @@
- return dup(0); // Need something for the caller to close
- }
-
-- int Tmp = errno;
-+ Tmp = errno;
- close(FD);
- errno = Tmp;
- return -1;
-@@ -773,6 +774,7 @@
- GtkWidget *dialog = GTK_WIDGET(data);
-
- int retvalue = 0;
-+ int lock = 0;
-
- if (prompt)
- gksuui_dialog_set_prompt (GKSUUI_DIALOG(dialog), prompt);
-@@ -796,7 +798,6 @@
- g_free (msg);
- }
-
-- int lock = 0;
- if (grab)
- lock = grab_keyboard_and_mouse (dialog);
- retvalue = gtk_dialog_run (GTK_DIALOG(dialog));
-@@ -1220,6 +1221,7 @@
-
- if (print_pass)
- {
-+ int lock = 0;
- if (!gksuui_dialog_get_message (GKSUUI_DIALOG(dialog)))
- {
- gchar *msg =
-@@ -1230,7 +1232,6 @@
- g_free (msg);
- }
-
-- int lock = 0;
- if (grab)
- lock = grab_keyboard_and_mouse (dialog);
- retvalue = gtk_dialog_run (GTK_DIALOG(dialog));
Index: sysutils/libgksu/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/libgksu/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- sysutils/libgksu/Makefile 6 Jun 2008 14:03:13 -0000 1.13
+++ sysutils/libgksu/Makefile 15 Apr 2011 11:36:13 -0000
@@ -6,22 +6,26 @@
#
PORTNAME= libgksu
-PORTVERSION= 1.3.8
-PORTREVISION= 3
+PORTVERSION= 2.0.9
CATEGORIES= sysutils
-MASTER_SITES= http://people.debian.org/~kov/gksu/old_stuff/libgksu1.2/
-DISTNAME= ${PORTNAME}1.2-${PORTVERSION}
+MASTER_SITES= http://people.debian.org/~kov/gksu/
MAINTAINER= bsam at FreeBSD.org
COMMENT= Library providing su and sudo functionality
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
+ glade-2.0:${PORTSDIR}/devel/libglade2 \
+ gcr.0:${PORTSDIR}/security/gnome-keyring \
+ startup-notification-1.0:${PORTSDIR}/x11/startup-notification
RUN_DEPENDS= xauth:${PORTSDIR}/x11/xauth \
sudo:${PORTSDIR}/security/sudo
-USE_GNOME= pkgconfig glib20
+USE_GNOME= pkgconfig glib20 gconf2
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-gtk-doc=no
GNU_CONFIGURE= yes
+GCONF_SCHEMAS= gksu.schemas
+USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
Index: sysutils/libgksu/distinfo
===================================================================
RCS file: /home/pcvs/ports/sysutils/libgksu/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- sysutils/libgksu/distinfo 19 Mar 2011 12:32:44 -0000 1.5
+++ sysutils/libgksu/distinfo 15 Apr 2011 11:36:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (libgksu1.2-1.3.8.tar.gz) = 7da12cd310d38f25962bd69590bdfa58ae436e6f97955220b371c7573561a49e
-SIZE (libgksu1.2-1.3.8.tar.gz) = 594567
+SHA256 (libgksu-2.0.9.tar.gz) = b8d3a2d012b2fa3d578be2d0c8d533cd5227c361c1da29a768f013106fa39627
+SIZE (libgksu-2.0.9.tar.gz) = 516246
Index: sysutils/libgksu/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/sysutils/libgksu/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- sysutils/libgksu/pkg-plist 22 May 2006 21:24:14 -0000 1.5
+++ sysutils/libgksu/pkg-plist 15 Apr 2011 11:36:13 -0000
@@ -1,26 +1,16 @@
-include/libgksu1.2/gksu-context.h
-include/libgksu1.2/gksu.h
-lib/libgksu1.2.a
-lib/libgksu1.2.la
-lib/libgksu1.2.so
-lib/libgksu1.2.so.0
-lib/libgksu1.2/gksu-run-helper
-libdata/pkgconfig/libgksu1.2.pc
-share/locale/ca/LC_MESSAGES/libgksu1.2.mo
-share/locale/da/LC_MESSAGES/libgksu1.2.mo
-share/locale/de/LC_MESSAGES/libgksu1.2.mo
-share/locale/es/LC_MESSAGES/libgksu1.2.mo
-share/locale/it/LC_MESSAGES/libgksu1.2.mo
-share/locale/pt_BR/LC_MESSAGES/libgksu1.2.mo
-share/locale/ru/LC_MESSAGES/libgksu1.2.mo
-share/locale/sv/LC_MESSAGES/libgksu1.2.mo
-share/locale/cs/LC_MESSAGES/libgksu1.2.mo
-share/locale/nl/LC_MESSAGES/libgksu1.2.mo
-share/locale/eu/LC_MESSAGES/libgksu1.2.mo
-share/locale/pl/LC_MESSAGES/libgksu1.2.mo
-share/locale/hu/LC_MESSAGES/libgksu1.2.mo
-share/locale/ro/LC_MESSAGES/libgksu1.2.mo
-share/locale/nb/LC_MESSAGES/libgksu1.2.mo
-share/locale/sk/LC_MESSAGES/libgksu1.2.mo
- at dirrm lib/libgksu1.2
- at dirrm include/libgksu1.2
+bin/gksu-properties
+include/libgksu/gksu.h
+include/libgksu/libgksu.h
+lib/libgksu2.a
+lib/libgksu2.la
+lib/libgksu2.so
+lib/libgksu2.so.0
+lib/libgksu/gksu-run-helper
+libdata/pkgconfig/libgksu2.pc
+share/applications/gksu-properties.desktop
+share/libgksu/gksu-properties.glade
+share/pixmaps/gksu.png
+ at dirrm share/libgksu
+ at dirrm lib/libgksu
+ at dirrm include/libgksu
+ at dirrmtry share/applications
Index: sysutils/libgksu/files/patch-Makefile.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/libgksu/files/patch-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile.in
--- sysutils/libgksu/files/patch-Makefile.in 5 Nov 2004 06:08:00 -0000 1.1
+++ sysutils/libgksu/files/patch-Makefile.in 15 Apr 2011 11:36:13 -0000
@@ -1,11 +1,19 @@
---- Makefile.in.orig Thu Sep 30 20:39:24 2004
-+++ Makefile.in Fri Oct 1 16:00:27 2004
-@@ -171,7 +171,7 @@
+--- Makefile.in.o 2011-04-13 15:10:53.221097086 +0000
++++ Makefile.in 2011-04-13 15:11:33.181096740 +0000
+@@ -747,11 +747,11 @@
+ @INTLTOOL_SCHEMAS_RULE@
- DISTCLEANFILES = *~
-
--SUBDIRS = m4 intl po libgksu docs
-+SUBDIRS = m4 intl po libgksu
- DIST_SUBDIRS = $(SUBDIRS)
-
- ACLOCAL_AMFLAGS = -I m4
+ @GCONF_SCHEMAS_INSTALL_TRUE at install-data-local:
+- at GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \
+- at GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \
+- at GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
+- at GCONF_SCHEMAS_INSTALL_TRUE@ done \
+- at GCONF_SCHEMAS_INSTALL_TRUE@ fi
++ at GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \
++ at GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \
++ at GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
++ at GCONF_SCHEMAS_INSTALL_TRUE@ done \
++ at GCONF_SCHEMAS_INSTALL_TRUE@ fi
+ @GCONF_SCHEMAS_INSTALL_FALSE at install-data-local:
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Index: sysutils/libgksu/files/patch-libgksu_Makefile.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/libgksu/files/patch-libgksu_Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-libgksu_Makefile.in
--- sysutils/libgksu/files/patch-libgksu_Makefile.in 5 Nov 2004 06:08:00 -0000 1.1
+++ sysutils/libgksu/files/patch-libgksu_Makefile.in 15 Apr 2011 11:36:13 -0000
@@ -1,20 +1,20 @@
---- libgksu/Makefile.in.orig Tue Sep 7 21:51:54 2004
-+++ libgksu/Makefile.in Fri Nov 5 00:43:20 2004
-@@ -168,7 +168,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- libgksu/Makefile.in.o 2011-04-11 13:45:10.938246716 -0400
++++ libgksu/Makefile.in 2011-04-11 13:46:36.384246142 -0400
+@@ -266,7 +266,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
-AM_CFLAGS = -g -O2 -Wall
+AM_CFLAGS = $(CFLAGS)
- INCLUDES = `pkg-config --cflags glib-2.0`
+ INCLUDES = ${LIBGKSU_CFLAGS}
AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
- LTPACKAGE = $(shell echo ${PACKAGE} | sed s,.,_,g)
-@@ -185,7 +185,7 @@
-
- include_HEADERS = gksu.h gksu-context.h
-
+ lib_LTLIBRARIES = libgksu2.la
+@@ -280,7 +280,7 @@
+ ${LIBGKSU_LIBS} $(am__append_1)
+ noinst_HEADERS = defines.h
+ include_HEADERS = gksu.h libgksu.h
-pkgconfigdir = ${libdir}/pkgconfig
+pkgconfigdir = ${prefix}/libdata/pkgconfig
- pkgconfig_DATA = ${PACKAGE}.pc
- pkglib_PROGRAMS = gksu-run-helper
+ pkgconfig_DATA = libgksu2.pc
gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
+ gksu_run_helper_SOURCES = gksu-run-helper.c
Index: sysutils/libgksu/files/patch-libgksu_gksu-context.c
===================================================================
RCS file: sysutils/libgksu/files/patch-libgksu_gksu-context.c
diff -N sysutils/libgksu/files/patch-libgksu_gksu-context.c
--- sysutils/libgksu/files/patch-libgksu_gksu-context.c 22 May 2006 21:24:14 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,100 +0,0 @@
---- libgksu/gksu-context.c.orig Mon May 1 01:08:30 2006
-+++ libgksu/gksu-context.c Mon May 22 14:06:23 2006
-@@ -23,9 +23,14 @@
- #include <unistd.h>
- #include <string.h>
- #include <fcntl.h>
--#include <pty.h>
--#include <pwd.h>
-+
- #include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <termios.h>
-+#include <libutil.h>
-+#include <signal.h>
-+
-+#include <pwd.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <sys/select.h>
-@@ -455,6 +460,7 @@
- gchar *tmp = NULL;
- gchar **tmpv = NULL;
- gchar *display = NULL;
-+ size_t r;
-
- /* avoid problems with "network" DISPLAY's */
- display = g_strdup (getenv ("DISPLAY"));
-@@ -484,6 +490,7 @@
- "head -1 | awk '{ print $3 }'",
- xauth_bin,
- context->display);
-+
- if ((xauth_output = popen (tmp, "r")) == NULL)
- {
- fprintf (stderr,
-@@ -491,8 +498,8 @@
- strerror(errno));
- return 1;
- }
-- fread (xauth, sizeof(char), 256, xauth_output);
-- xauth[strlen(xauth) - 1] = '\0';
-+ r = fread (xauth, sizeof(char), 256, xauth_output);
-+ xauth[r] = '\0';
- pclose (xauth_output);
- g_free (tmp);
-
-@@ -650,7 +657,7 @@
- {
- gchar **cmd = g_malloc (sizeof(gchar*)*7);
-
-- cmd[i] = g_strdup ("/bin/su"); i++;
-+ cmd[i] = g_strdup ("/usr/bin/su"); i++;
- if (context->login_shell)
- {
- cmd[i] = g_strdup ("-"); i++;
-@@ -671,7 +678,7 @@
- if (execv (cmd[0], cmd) == -1)
- {
- fprintf (stderr,
-- _("Unable to run /bin/su: %s"),
-+ _("Unable to run /usr/bin/su: %s"),
- strerror(errno));
-
- for (i = 0 ; cmd[i] != NULL ; i++)
-@@ -808,7 +815,7 @@
- {
- gchar **cmd = g_malloc (sizeof(gchar*)*7);
-
-- cmd[i] = g_strdup ("/bin/su"); i++;
-+ cmd[i] = g_strdup ("/usr/bin/su"); i++;
- if (context->login_shell)
- {
- cmd[i] = g_strdup ("-"); i++;
-@@ -830,7 +837,7 @@
- if (execv (cmd[0], cmd) == -1)
- {
- fprintf (stderr,
-- _("Unable to run /bin/su: %s"),
-+ _("Unable to run /usr/bin/su: %s"),
- strerror(errno));
- }
-
-@@ -1097,7 +1104,7 @@
- argcount = 0;
-
- /* sudo binary */
-- cmd[argcount] = g_strdup("/usr/bin/sudo");
-+ cmd[argcount] = g_strdup("/usr/local/bin/sudo");
- argcount++;
-
- /* Make sudo read from STDIN */
-@@ -1276,7 +1283,7 @@
- argcount = 0;
-
- /* sudo binary */
-- cmd[argcount] = g_strdup("/usr/bin/sudo");
-+ cmd[argcount] = g_strdup("/usr/local/bin/sudo");
- argcount++;
-
- if (!context->keep_env)
Index: sysutils/libgksu/files/patch-libgksu_gksu-run-helper.c
===================================================================
RCS file: sysutils/libgksu/files/patch-libgksu_gksu-run-helper.c
diff -N sysutils/libgksu/files/patch-libgksu_gksu-run-helper.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/libgksu/files/patch-libgksu_gksu-run-helper.c 15 Apr 2011 11:36:13 -0000
@@ -0,0 +1,21 @@
+--- libgksu/gksu-run-helper.c.o 2011-04-12 16:47:38.000000000 +0000
++++ libgksu/gksu-run-helper.c 2011-04-12 16:49:14.000000000 +0000
+@@ -110,6 +110,7 @@
+ return 1;
+ }
+
++ sleep(2);
+ fprintf (stderr, "gksu: waiting\n");
+
+ xauth_file = g_strdup_printf ("%s/.Xauthority",
+@@ -159,8 +160,8 @@
+ /* find out where the xauth binary is located */
+ if (g_file_test ("/usr/bin/xauth", G_FILE_TEST_IS_EXECUTABLE))
+ xauth_bin = "/usr/bin/xauth";
+- else if (g_file_test ("/usr/X11R6/bin/xauth", G_FILE_TEST_IS_EXECUTABLE))
+- xauth_bin = "/usr/X11R6/bin/xauth";
++ else if (g_file_test ("/usr/local/bin/xauth", G_FILE_TEST_IS_EXECUTABLE))
++ xauth_bin = "/usr/local/bin/xauth";
+ else
+ {
+ fprintf (stderr,
Index: sysutils/libgksu/files/patch-libgksu_libgksu.c
===================================================================
RCS file: sysutils/libgksu/files/patch-libgksu_libgksu.c
diff -N sysutils/libgksu/files/patch-libgksu_libgksu.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/libgksu/files/patch-libgksu_libgksu.c 15 Apr 2011 11:36:13 -0000
@@ -0,0 +1,75 @@
+--- libgksu/libgksu.c.orig 2009-03-04 18:53:02.000000000 +0000
++++ libgksu/libgksu.c 2011-04-12 16:45:53.000000000 +0000
+@@ -23,13 +23,15 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <fcntl.h>
+-#include <pty.h>
+ #include <pwd.h>
++#include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <sys/select.h>
+ #include <errno.h>
++#include <termios.h>
++#include <libutil.h>
+
+ #include <glibtop.h>
+ #include <glibtop/procstate.h>
+@@ -1089,8 +1091,8 @@
+ gchar *xauth = g_new0 (gchar, 256);
+
+ /* find out where the xauth binary is located */
+- if (g_file_test ("/usr/bin/xauth", G_FILE_TEST_IS_EXECUTABLE))
+- xauth_bin = "/usr/bin/xauth";
++ if (g_file_test ("/usr/local/bin/xauth", G_FILE_TEST_IS_EXECUTABLE))
++ xauth_bin = "/usr/local/bin/xauth";
+ else if (g_file_test ("/usr/X11R6/bin/xauth", G_FILE_TEST_IS_EXECUTABLE))
+ xauth_bin = "/usr/X11R6/bin/xauth";
+ else
+@@ -1976,7 +1978,7 @@
+ gchar **cmd = g_malloc (sizeof(gchar*)*7);
+
+ setsid(); // make us session leader
+- cmd[i] = g_strdup ("/bin/su"); i++;
++ cmd[i] = g_strdup ("/usr/bin/su"); i++;
+ if (context->login_shell)
+ {
+ cmd[i] = g_strdup ("-"); i++;
+@@ -1998,7 +2000,7 @@
+ if (execv (cmd[0], cmd) == -1)
+ {
+ fprintf (stderr,
+- "Unable to run /bin/su: %s",
++ "Unable to run /usr/bin/su: %s",
+ strerror(errno));
+ }
+
+@@ -2190,8 +2192,6 @@
+ write (fdpty, line, strlen(line));
+ g_free (line);
+
+- tcdrain (fdpty);
+-
+ bzero (buf, 256);
+ read (fdpty, buf, 255);
+
+@@ -2503,7 +2503,7 @@
+ if (context->always_ask_password)
+ {
+ gint exit_status;
+- g_spawn_command_line_sync("/usr/bin/sudo -K", NULL, NULL, &exit_status, NULL);
++ g_spawn_command_line_sync("/usr/local/bin/sudo -K", NULL, NULL, &exit_status, NULL);
+ }
+
+
+@@ -2533,7 +2533,7 @@
+ argcount = 0;
+
+ /* sudo binary */
+- cmd[argcount] = g_strdup("/usr/bin/sudo");
++ cmd[argcount] = g_strdup("/usr/local/bin/sudo");
+ argcount++;
+
+ if (!context->keep_env)
Index: sysutils/libgksu/files/patch-libgksu_test-gksu.c
===================================================================
RCS file: sysutils/libgksu/files/patch-libgksu_test-gksu.c
diff -N sysutils/libgksu/files/patch-libgksu_test-gksu.c
--- sysutils/libgksu/files/patch-libgksu_test-gksu.c 5 Nov 2004 06:08:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- libgksu/test-gksu.c.orig Thu Sep 30 20:40:04 2004
-+++ libgksu/test-gksu.c Thu Sep 30 17:39:36 2004
-@@ -34,7 +34,7 @@
- context = gksu_context_new ();
-
- gksu_context_set_debug (context, TRUE);
-- gksu_context_set_command (context, "/usr/bin/X11/xterm");
-+ gksu_context_set_command (context, "/usr/X11R6/bin/xterm");
-
- password = getpass ("Type the root password: ");
- gksu_context_set_password (context, password);
Index: x11-toolkits/py-gnome-extras/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/py-gnome-extras/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- x11-toolkits/py-gnome-extras/Makefile 25 Nov 2010 13:25:05 -0000 1.39
+++ x11-toolkits/py-gnome-extras/Makefile 15 Apr 2011 11:36:13 -0000
@@ -8,7 +8,7 @@
PORTNAME= gnome-extras
PORTVERSION= 2.25.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -20,8 +20,7 @@
COMMENT= A set of Python bindings for GNOME 2
LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell \
- gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
- gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui
+ gksu2.0:${PORTSDIR}/sysutils/libgksu \
# gdl-1.2:${PORTSDIR}/x11-toolkits/gdl
USE_GECKO= libxul
Index: x11-toolkits/py-gnome-extras/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/py-gnome-extras/pkg-plist,v
retrieving revision 1.13
diff -u -r1.13 pkg-plist
--- x11-toolkits/py-gnome-extras/pkg-plist 28 Nov 2009 20:06:23 -0000 1.13
+++ x11-toolkits/py-gnome-extras/pkg-plist 15 Apr 2011 11:36:13 -0000
@@ -8,13 +8,11 @@
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/_gksu.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/_gksu.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/ui.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/ui.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu2/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu2/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu2/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu2/_gksu2.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu2/_gksu2.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkhtml2.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkhtml2.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkmozembed.la
@@ -48,6 +46,6 @@
%%PORTDOCS%%@dirrm share/examples/py-gnome/gdl
%%PORTDOCS%%@dirrm share/examples/py-gnome/egg/recent
%%PORTDOCS%%@dirrm share/examples/py-gnome/egg
- at dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu
+ at dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu2
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/egg
@dirrm include/pygda-4.0
-----
--
WBR, bsam
More information about the freebsd-gnome
mailing list