diff options
author | Boris Samorodov <bsam@FreeBSD.org> | 2011-05-14 18:49:26 +0000 |
---|---|---|
committer | Boris Samorodov <bsam@FreeBSD.org> | 2011-05-14 18:49:26 +0000 |
commit | d79d568a73c0d7080b494b5889ab364d5de987be (patch) | |
tree | f48ae69513e8b2f92ea923f2b599fd13eff622d1 /sysutils/gksu/files | |
parent | ad011a097d7591a54d339602615817746ec9ccda (diff) |
Notes
Diffstat (limited to 'sysutils/gksu/files')
-rw-r--r-- | sysutils/gksu/files/patch-gksu_Makefile.in | 37 | ||||
-rw-r--r-- | sysutils/gksu/files/patch-gksu_gksu.c | 82 |
2 files changed, 0 insertions, 119 deletions
diff --git a/sysutils/gksu/files/patch-gksu_Makefile.in b/sysutils/gksu/files/patch-gksu_Makefile.in deleted file mode 100644 index 4df2b171efc8..000000000000 --- a/sysutils/gksu/files/patch-gksu_Makefile.in +++ /dev/null @@ -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 - --@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@install-data-local: --@GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \ --@GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \ --@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ --@GCONF_SCHEMAS_INSTALL_TRUE@ done \ --@GCONF_SCHEMAS_INSTALL_TRUE@ fi -+@GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \ -+@GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \ -+@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ -+@GCONF_SCHEMAS_INSTALL_TRUE@ done \ -+@GCONF_SCHEMAS_INSTALL_TRUE@ fi - @GCONF_SCHEMAS_INSTALL_FALSE@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. diff --git a/sysutils/gksu/files/patch-gksu_gksu.c b/sysutils/gksu/files/patch-gksu_gksu.c deleted file mode 100644 index 5df2cac05bd4..000000000000 --- a/sysutils/gksu/files/patch-gksu_gksu.c +++ /dev/null @@ -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)); |