summaryrefslogtreecommitdiff
path: root/package/polkit/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/polkit/patches')
-rw-r--r--package/polkit/patches/patch-Makefile_am10
-rw-r--r--package/polkit/patches/patch-actions_Makefile_am11
-rw-r--r--package/polkit/patches/patch-autogen_sh63
-rw-r--r--package/polkit/patches/patch-configure_ac63
-rw-r--r--package/polkit/patches/patch-src_polkit_Makefile_am35
-rw-r--r--package/polkit/patches/patch-src_polkitagent_Makefile_am37
-rw-r--r--package/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority_c31
-rw-r--r--package/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority_c38
8 files changed, 0 insertions, 288 deletions
diff --git a/package/polkit/patches/patch-Makefile_am b/package/polkit/patches/patch-Makefile_am
deleted file mode 100644
index 878409f17..000000000
--- a/package/polkit/patches/patch-Makefile_am
+++ /dev/null
@@ -1,10 +0,0 @@
---- polkit-0.112.orig/Makefile.am 2013-09-18 18:55:09.000000000 +0200
-+++ polkit-0.112/Makefile.am 2014-01-09 21:28:39.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
-
--SUBDIRS = actions data src docs po test
-+SUBDIRS = data src
-
- NULL =
-
diff --git a/package/polkit/patches/patch-actions_Makefile_am b/package/polkit/patches/patch-actions_Makefile_am
deleted file mode 100644
index ea3d2131a..000000000
--- a/package/polkit/patches/patch-actions_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- polkit-0.112.orig/actions/Makefile.am 2013-09-18 18:55:09.000000000 +0200
-+++ polkit-0.112/actions/Makefile.am 2014-01-09 21:14:31.000000000 +0100
-@@ -3,8 +3,6 @@ polkit_actiondir = $(datadir)/polkit-1/a
-
- dist_polkit_action_DATA = org.freedesktop.policykit.policy
-
--@INTLTOOL_POLICY_RULE@
--
- #check:
- # $(top_builddir)/tools/polkit-policy-file-validate-1 $(top_srcdir)/policy/$(dist_polkit_action_DATA)
-
diff --git a/package/polkit/patches/patch-autogen_sh b/package/polkit/patches/patch-autogen_sh
deleted file mode 100644
index 6c2cf15a2..000000000
--- a/package/polkit/patches/patch-autogen_sh
+++ /dev/null
@@ -1,63 +0,0 @@
---- polkit-0.112.orig/autogen.sh 2013-09-18 18:55:09.000000000 +0200
-+++ polkit-0.112/autogen.sh 2014-01-09 21:12:29.000000000 +0100
-@@ -34,14 +34,6 @@ touch ChangeLog
- }
- }
-
--(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
-- echo
-- echo "You must have gtk-doc installed to compile $PROJECT."
-- echo "Install the appropriate package for your distribution,"
-- echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-- DIE=1
--}
--
- (automake --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have automake installed."
-@@ -74,13 +66,6 @@ if test "$DIE" -eq 1; then
- exit 1
- fi
-
--if test -z "$*"; then
-- echo "**Warning**: I am going to run configure with no arguments."
-- echo "If you wish to pass any to it, please specify them on the"
-- echo $0 " command line."
-- echo
--fi
--
- case $CC in
- xlc )
- am_opt=--include-deps;;
-@@ -88,13 +73,10 @@ esac
-
- aclocalinclude="$ACLOCAL_FLAGS"
-
-- echo "Running autoreconf on test/mocklibc ..."
-- (cd "test/mocklibc"; autoreconf --install)
--
- if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
- if test -z "$NO_LIBTOOLIZE" ; then
- echo "Running libtoolize..."
-- libtoolize --force --copy
-+ libtoolize -q --force --copy
- fi
- fi
- echo "Running aclocal $aclocalinclude ..."
-@@ -108,16 +90,4 @@ esac
- echo "Running autoconf ..."
- autoconf
-
--intltoolize --copy --force --automake || exit 1
--
- cd "$olddir"
--
--conf_flags="--enable-maintainer-mode --enable-gtk-doc"
--
--if test x$NOCONFIGURE = x; then
-- echo "Running $srcdir/configure $conf_flags $@ ..."
-- $srcdir/configure $conf_flags "$@" \
-- && echo "Now type make to compile." || exit 1
--else
-- echo "Skipping configure process."
--fi
diff --git a/package/polkit/patches/patch-configure_ac b/package/polkit/patches/patch-configure_ac
deleted file mode 100644
index 65681615d..000000000
--- a/package/polkit/patches/patch-configure_ac
+++ /dev/null
@@ -1,63 +0,0 @@
---- polkit-0.112.orig/configure.ac 2013-09-18 18:55:09.000000000 +0200
-+++ polkit-0.112/configure.ac 2014-01-11 11:22:30.000000000 +0100
-@@ -8,9 +8,6 @@ AM_MAINTAINER_MODE
-
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
--# Include external mocklibc tool for unit testing
--AC_CONFIG_SUBDIRS([test/mocklibc])
--
- # libtool versioning - this applies to all libraries in this package
- #
- # See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details
-@@ -46,8 +43,6 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
- fi
- AM_CONDITIONAL(MAN_PAGES_ENABLED, test x$enable_man_pages = xyes)
-
--GTK_DOC_CHECK([1.3])
--
- #### gcc warning flags
-
- if test "x$GCC" = "xyes"; then
-@@ -158,7 +153,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXP
- [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
- AC_SUBST(EXPAT_LIBS)
-
--AC_CHECK_FUNCS(clearenv)
-+AC_CHECK_FUNCS(clearenv getnetgrent innetgr)
-
- if test "x$GCC" = "xyes"; then
- LDFLAGS="-Wl,--as-needed $LDFLAGS"
-@@ -476,8 +471,6 @@ case "$host_os" in
- ;;
- esac
-
--GOBJECT_INTROSPECTION_CHECK([0.6.2])
--
- AC_ARG_ENABLE([examples],
- AS_HELP_STRING([--enable-examples], [Build the example programs]),,
- [enable_examples=yes])
-@@ -488,7 +481,6 @@ AM_CONDITIONAL(BUILD_EXAMPLES, test "x$e
- # Internationalization
- # ********************
-
--IT_PROG_INTLTOOL([0.40.0])
- GETTEXT_PACKAGE=polkit-1
- AC_SUBST([GETTEXT_PACKAGE])
- AM_GLIB_GNU_GETTEXT
-@@ -512,15 +504,6 @@ src/polkitbackend/Makefile
- src/polkitagent/Makefile
- src/programs/Makefile
- src/examples/Makefile
--docs/version.xml
--docs/extensiondir.xml
--docs/Makefile
--docs/polkit/Makefile
--docs/man/Makefile
--po/Makefile.in
--test/Makefile
--test/polkit/Makefile
--test/polkitbackend/Makefile
- ])
-
- dnl ==========================================================================
diff --git a/package/polkit/patches/patch-src_polkit_Makefile_am b/package/polkit/patches/patch-src_polkit_Makefile_am
deleted file mode 100644
index 4aa7ad8a7..000000000
--- a/package/polkit/patches/patch-src_polkit_Makefile_am
+++ /dev/null
@@ -1,35 +0,0 @@
---- polkit-0.112.orig/src/polkit/Makefile.am 2013-09-18 18:55:09.000000000 +0200
-+++ polkit-0.112/src/polkit/Makefile.am 2014-01-09 21:13:06.000000000 +0100
-@@ -102,32 +102,6 @@ libpolkit_gobject_1_la_LIBADD =
-
- libpolkit_gobject_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)'
-
--if HAVE_INTROSPECTION
--
--INTROSPECTION_GIRS = Polkit-1.0.gir
--
--Polkit-1.0.gir: libpolkit-gobject-1.la
--
--girdir = $(INTROSPECTION_GIRDIR)
--gir_DATA = Polkit-1.0.gir
--
--typelibsdir = $(INTROSPECTION_TYPELIBDIR)
--typelibs_DATA = Polkit-1.0.typelib
--
--Polkit_1_0_gir_INCLUDES = Gio-2.0
--Polkit_1_0_gir_SCANNERFLAGS = --c-include='polkit/polkit.h'
--Polkit_1_0_gir_CFLAGS = \
-- $(libpolkit_gobject_1_la_CFLAGS) \
-- -D_POLKIT_COMPILATION \
-- -I.. -I$(top_srcdir)/src
--Polkit_1_0_gir_LIBS = libpolkit-gobject-1.la
--Polkit_1_0_gir_FILES = $(libpolkit_gobject_1_la_SOURCES)
--Polkit_1_0_gir_EXPORT_PACKAGES = polkit-gobject-1
--
--include $(INTROSPECTION_MAKEFILE)
--
--endif # HAVE_INTROSPECTION
--
- EXTRA_DIST = polkitenumtypes.h.template polkitenumtypes.c.template
- CLEANFILES = $(gir_DATA) $(typelibs_DATA)
-
diff --git a/package/polkit/patches/patch-src_polkitagent_Makefile_am b/package/polkit/patches/patch-src_polkitagent_Makefile_am
deleted file mode 100644
index 7a5aaeea1..000000000
--- a/package/polkit/patches/patch-src_polkitagent_Makefile_am
+++ /dev/null
@@ -1,37 +0,0 @@
---- polkit-0.112.orig/src/polkitagent/Makefile.am 2013-09-18 18:55:09.000000000 +0200
-+++ polkit-0.112/src/polkitagent/Makefile.am 2014-01-09 21:13:36.000000000 +0100
-@@ -109,34 +109,6 @@ polkit_agent_helper_1_LDFLAGS = \
- $(AM_LDFLAGS) \
- $(NULL)
-
--if HAVE_INTROSPECTION
--
--girdir = $(INTROSPECTION_GIRDIR)
--gir_DATA = PolkitAgent-1.0.gir
--
--PolkitAgent-1.0.gir: libpolkit-agent-1.la
--
--typelibsdir = $(INTROSPECTION_TYPELIBDIR)
--typelibs_DATA = PolkitAgent-1.0.typelib
--
--INTROSPECTION_COMPILER_ARGS = --includedir=../../src/polkit
--INTROSPECTION_GIRS = PolkitAgent-1.0.gir
--PolkitAgent_1_0_gir_INCLUDES = Gio-2.0
--PolkitAgent_1_0_gir_SCANNERFLAGS = \
-- --include-uninstalled=../../src/polkit/Polkit-1.0.gir \
-- --c-include='polkitagent/polkitagent.h'
--PolkitAgent_1_0_gir_CFLAGS = \
-- $(libpolkit_agent_1_la_CFLAGS) \
-- -D_POLKIT_COMPILATION \
-- -D_POLKIT_AGENT_COMPILATION \
-- -I.. -I$(top_srcdir)/src
--PolkitAgent_1_0_gir_LIBS = libpolkit-agent-1.la
--PolkitAgent_1_0_gir_FILES = $(libpolkit_agent_1_la_SOURCES)
--PolkitAgent_1_0_gir_EXPORT_PACKAGES = polkit-agent-1
--
--include $(INTROSPECTION_MAKEFILE)
--
--endif # HAVE_INTROSPECTION
-
- # polkit-agent-helper-1 need to be setuid root because it's used to
- # authenticate not only the invoking user, but possibly also root
diff --git a/package/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority_c b/package/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority_c
deleted file mode 100644
index 64608f5b5..000000000
--- a/package/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority_c
+++ /dev/null
@@ -1,31 +0,0 @@
---- polkit-0.112.orig/src/polkitbackend/polkitbackendinteractiveauthority.c 2013-09-18 18:55:09.000000000 +0200
-+++ polkit-0.112/src/polkitbackend/polkitbackendinteractiveauthority.c 2014-01-11 11:22:30.000000000 +0100
-@@ -2103,6 +2103,7 @@ get_users_in_group (PolkitIdentity
- return ret;
- }
-
-+#if defined(HAVE_GETNETGRENT)
- static GList *
- get_users_in_net_group (PolkitIdentity *group,
- gboolean include_root)
-@@ -2154,6 +2155,7 @@ get_users_in_net_group (PolkitIdentity
- endnetgrent ();
- return ret;
- }
-+#endif
-
- /* ---------------------------------------------------------------------------------------------------- */
-
-@@ -2243,10 +2245,12 @@ authentication_agent_initiate_challenge
- {
- user_identities = g_list_concat (user_identities, get_users_in_group (identity, FALSE));
- }
-+#if defined(HAVE_GETNETGRENT)
- else if (POLKIT_IS_UNIX_NETGROUP (identity))
- {
- user_identities = g_list_concat (user_identities, get_users_in_net_group (identity, FALSE));
- }
-+#endif
- else
- {
- g_warning ("Unsupported identity");
diff --git a/package/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority_c b/package/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority_c
deleted file mode 100644
index 14a702dda..000000000
--- a/package/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority_c
+++ /dev/null
@@ -1,38 +0,0 @@
---- polkit-0.112.orig/src/polkitbackend/polkitbackendjsauthority.c 2013-09-18 18:55:09.000000000 +0200
-+++ polkit-0.112/src/polkitbackend/polkitbackendjsauthority.c 2014-01-11 11:27:02.000000000 +0100
-@@ -29,6 +29,7 @@
- #include <glib/gstdio.h>
- #include <locale.h>
- #include <glib/gi18n-lib.h>
-+#include <sys/wait.h>
-
- #include <polkit/polkit.h>
- #include "polkitbackendjsauthority.h"
-@@ -1450,13 +1451,16 @@ js_polkit_user_is_in_netgroup (JSContext
- JSBool ret = JS_FALSE;
- JSString *user_str;
- JSString *netgroup_str;
-- char *user;
-- char *netgroup;
- JSBool is_in_netgroup = JS_FALSE;
-
- if (!JS_ConvertArguments (cx, argc, JS_ARGV (cx, vp), "SS", &user_str, &netgroup_str))
- goto out;
-
-+#if defined(HAVE_INNETGR)
-+ {
-+ char *user;
-+ char *netgroup;
-+
- user = JS_EncodeString (cx, user_str);
- netgroup = JS_EncodeString (cx, netgroup_str);
-
-@@ -1470,6 +1474,8 @@ js_polkit_user_is_in_netgroup (JSContext
-
- JS_free (cx, netgroup);
- JS_free (cx, user);
-+ }
-+#endif
-
- ret = JS_TRUE;
-