- Update to 1.3.8

PR:		ports/97599
Submitted by:	Boris Samorodov <bsam@ipt.ru> (maintainer)

4 files changed, 53 insertions, 16 deletions

diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index a9739f71b22a..183fe7c73bb0 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgksu
-PORTVERSION=	1.3.7
-PORTREVISION=	1
+PORTVERSION=	1.3.8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://people.debian.org/~kov/gksu/libgksu1.2/
 DISTNAME=	${PORTNAME}1.2-${PORTVERSION}
diff --git a/sysutils/libgksu/distinfo b/sysutils/libgksu/distinfo
index 008b4783651b..931aac0f1966 100644
--- a/sysutils/libgksu/distinfo
+++ b/sysutils/libgksu/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgksu1.2-1.3.7.tar.gz) = 9ee0808e8e24254cfc9f834a55093d06
-SHA256 (libgksu1.2-1.3.7.tar.gz) = 4957a47f8684a915236a414980ea8ff5e40255ccb885a4135e3365e6ef5c4a50
-SIZE (libgksu1.2-1.3.7.tar.gz) = 588795
+MD5 (libgksu1.2-1.3.8.tar.gz) = 5c0ffa259534829cb4c5772e694282e3
+SHA256 (libgksu1.2-1.3.8.tar.gz) = 7da12cd310d38f25962bd69590bdfa58ae436e6f97955220b371c7573561a49e
+SIZE (libgksu1.2-1.3.8.tar.gz) = 594567
diff --git a/sysutils/libgksu/files/patch-libgksu_gksu-context.c b/sysutils/libgksu/files/patch-libgksu_gksu-context.c
index 8c89f66b93ba..a95096c75fd8 100644
--- a/sysutils/libgksu/files/patch-libgksu_gksu-context.c
+++ b/sysutils/libgksu/files/patch-libgksu_gksu-context.c
@@ -1,6 +1,6 @@
---- libgksu/gksu-context.c.orig	Sun Oct 17 21:43:32 2004
-+++ libgksu/gksu-context.c	Fri Nov  5 01:01:45 2004
-@@ -23,9 +24,14 @@
+--- 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>
@@ -17,7 +17,7 @@
  #include <sys/wait.h>
  #include <sys/stat.h>
  #include <sys/select.h>
-@@ -419,6 +423,7 @@
+@@ -455,6 +460,7 @@
    gchar *tmp = NULL;
    gchar **tmpv = NULL;
    gchar *display = NULL;
@@ -25,15 +25,15 @@
  
    /* avoid problems with "network" DISPLAY's */
    display = g_strdup (getenv ("DISPLAY"));
-@@ -434,6 +439,7 @@
- 			 "grep 'MIT-MAGIC-COOKIE-1' | "
- 			 "cut -d ' ' -f 5",
+@@ -484,6 +490,7 @@
+ 			 "head -1 | awk '{ print $3 }'",
+ 			 xauth_bin,
  			 context->display);
 +
    if ((xauth_output = popen (tmp, "r")) == NULL)
      {
        fprintf (stderr,
-@@ -441,8 +447,8 @@
+@@ -491,8 +498,8 @@
  	       strerror(errno));
        return 1;
      }
@@ -44,7 +44,7 @@
    pclose (xauth_output);
    g_free (tmp);
  
-@@ -637,7 +643,7 @@
+@@ -650,7 +657,7 @@
      {
        gchar **cmd = g_malloc (sizeof(gchar*)*7);
  
@@ -53,12 +53,48 @@
        if (context->login_shell)
  	{
  	  cmd[i] = g_strdup ("-"); i++;
-@@ -659,7 +665,7 @@
+@@ -671,7 +678,7 @@
        if (execv (cmd[0], cmd) == -1)
  	{
- 	  fprintf (stderr, 
+ 	  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)
diff --git a/sysutils/libgksu/pkg-plist b/sysutils/libgksu/pkg-plist
index 0999827a18ee..573699c69399 100644
--- a/sysutils/libgksu/pkg-plist
+++ b/sysutils/libgksu/pkg-plist
@@ -10,8 +10,10 @@ 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