Initial commit

6 files changed, 357 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..e0b2434d5a4f
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,29 @@
+pkgbase = system-config-samba
+	pkgdesc = The Samba configuration tool by Red Hat
+	pkgver = 1.2.100
+	pkgrel = 1
+	url = http://fedoraproject.org/wiki/SystemConfig/samba
+	install = system-config-samba.install
+	arch = x86_64
+	arch = i686
+	license = GPLv2
+	makedepends = intltool
+	makedepends = gnome-common
+	makedepends = gnome-doc-utils
+	depends = samba
+	depends = libuser
+	depends = gksu
+	depends = python2
+	source = https://fedorahosted.org/released/system-config-samba/system-config-samba-1.2.100.tar.bz2
+	source = https://fedorahosted.org/released/system-config-samba-docs/system-config-samba-docs-1.0.9.tar.bz2
+	source = system-config-samba.patch
+	source = system-config-samba-docs.patch
+	source = system-config-samba.8
+	md5sums = 31f28460724553d4741e514462befaa3
+	md5sums = 4285494ecac5f4ed34bd515e40aa057c
+	md5sums = fa728f13b98dcd2e981aa2a4e61ca0d9
+	md5sums = ef9ed98bdf27661263477ef2d5ba92d6
+	md5sums = 5abeeeea50f3d57bf14f0125748dea4f
+
+pkgname = system-config-samba
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..c50317597c8b
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,64 @@
+# Maintainer : Simone Economo <my.ekoes@gmail.com>
+# Contributor: Boudhayan Gupta <me at BaloneyGeek dot com>
+
+pkgname=system-config-samba
+pkgver=1.2.100
+pkgrel=1
+_docsname=system-config-samba-docs
+_docsver=1.0.9
+pkgdesc="The Samba configuration tool by Red Hat"
+url="http://fedoraproject.org/wiki/SystemConfig/samba"
+arch=('x86_64' 'i686')
+license=('GPLv2')
+depends=('samba' 'libuser' 'gksu' 'python2')
+optdepends=()
+makedepends=('intltool' 'gnome-common' 'gnome-doc-utils')
+conflicts=()
+replaces=()
+backup=()
+install=system-config-samba.install
+source=("https://fedorahosted.org/released/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        "https://fedorahosted.org/released/${_docsname}/${_docsname}-${_docsver}.tar.bz2"
+        "${pkgname}.patch"
+        "${_docsname}.patch"
+        "${pkgname}.8")
+md5sums=('31f28460724553d4741e514462befaa3'
+         '4285494ecac5f4ed34bd515e40aa057c'
+         'fa728f13b98dcd2e981aa2a4e61ca0d9'
+         'ef9ed98bdf27661263477ef2d5ba92d6'
+         '5abeeeea50f3d57bf14f0125748dea4f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  rm {git_rules.mk,polkit_rules.mk,rpmspec_rules.mk,scm_rules.mk,upload_rules.mk}
+  rm config/org.fedoraproject.config.samba.policy.{0,1}.in
+  rm -r src/scsamba/dbus
+  rm src/system-config-samba-mechanism.py
+
+  # Python 2 fix
+  find . -name '*.py' | \
+    xargs sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|"
+
+  sed -i 's|python|python2|g' py_rules.mk
+  # --
+
+  patch -p1 -i ../${pkgname}.patch
+  make
+
+  cd "${srcdir}/${_docsname}-${_docsver}"
+
+  patch -p1 -i ../${_docsname}.patch
+  make  
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/${_docsname}-${_docsver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm644 "${srcdir}/${pkgname}.8" "${pkgdir}/usr/share/man/man8/${pkgname}.8"
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/system-config-samba-docs.patch b/system-config-samba-docs.patch
new file mode 100644
index 000000000000..7a6e668aa52a
--- /dev/null
+++ b/system-config-samba-docs.patch
@@ -0,0 +1,12 @@
+diff -urpN system-config-samba-docs-1.0.9/doc/ca/ca.po changed-docs/doc/ca/ca.po
+--- system-config-samba-docs-1.0.9/doc/ca/ca.po	2010-08-24 15:01:52.000000000 +0200
++++ changed-docs/doc/ca/ca.po	2014-07-31 01:52:20.737625451 +0200
+@@ -164,7 +164,7 @@ msgstr ""
+ "tenir privilegis de root per tal de poder fer servir l'eina de configuració "
+ "de Samba. Per iniciar l'aplicació a l'escriptori, aneu al "
+ "<menuchoice><guimenu>menú principal al quadre (el menu amb la icona \"f\"</"
+-"guimenu>guisubmenu>Sistema</guisubmenu><guisubmenu>Administració</"
++"guimenu><guisubmenu>Sistema</guisubmenu><guisubmenu>Administració</"
+ "guisubmenu><guimenuitem>Samba</quimenuitem></menuchoice>."
+ 
+ #: /home/nils/src/docs/system-config-samba-docs/doc/C/system-config-samba-complete.xml:37(para)
diff --git a/system-config-samba.8 b/system-config-samba.8
new file mode 100644
index 000000000000..f4a76482686c
--- /dev/null
+++ b/system-config-samba.8
@@ -0,0 +1,25 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.TH SYSTEM-CONFIG-SAMBA 8 "Jun 12, 2007"
+.SH NAME
+system-config-samba \- GUI for managing Samba shares and users
+.SH SYNOPSIS
+.B system-config-samba
+.SH DESCRIPTION
+This manual page documents briefly the
+.B system-config-samba
+command.
+.PP
+.B system-config-samba
+is a program that provides a graphical interface for managing Samba users and shares.
+.SH SEE ALSO
+.BR samba (7)
+.br
+The program is fully documented at 
+.nh
+.I file:///usr/share/doc/system-config-samba/index.html
+.hy
+.SH AUTHOR
+redhat-config-samba was written by Brent Fox <bfox@redhat.com>.
+.PP
+This manual page was written by Soren Hansen <soren@ubuntu.com>,
+for Ubuntu (but may be used by others).
diff --git a/system-config-samba.install b/system-config-samba.install
new file mode 100644
index 000000000000..c317fbaca442
--- /dev/null
+++ b/system-config-samba.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/system-config-samba.patch b/system-config-samba.patch
new file mode 100644
index 000000000000..4c6200995333
--- /dev/null
+++ b/system-config-samba.patch
@@ -0,0 +1,215 @@
+diff -urpN system-config-samba-1.2.100/Makefile changed/Makefile
+--- system-config-samba-1.2.100/Makefile	2013-02-01 15:45:10.000000000 +0100
++++ changed/Makefile	2014-07-30 21:44:34.883890568 +0200
+@@ -3,9 +3,6 @@
+ 
+ PKGNAME=system-config-samba
+ 
+-SCM_REMOTEREPO_RE = ^ssh://(.*@)?git.fedorahosted.org/git/$(PKGNAME).git$
+-UPLOAD_URL = ssh://fedorahosted.org/$(PKGNAME)
+-
+ PREFIX=/usr
+ SYSCONFDIR=/etc
+ BINDIR=${PREFIX}/bin
+@@ -14,14 +11,8 @@ MANDIR=${DATADIR}/man
+ PKGDATADIR=${DATADIR}/${PKGNAME}
+ PKGIMAGEDIR=${PKGDATADIR}/pixmaps
+ 
+-DBUS_POLICY_DIR=$(SYSCONFDIR)/dbus-1/system.d
+-DBUS_SERVICE_DIR=$(DATADIR)/dbus-1/system-services
+-
+-POLKIT_FILES			= config/org.fedoraproject.config.samba.policy.0 \
+-						  config/org.fedoraproject.config.samba.policy.1
+-
+ PY_SRC_DIR				= src
+-PY_SRC_APPS				= addUserWin.py basicPreferencesWin.py mainWindow.py sambaUserWin.py shareWindow.py system-config-samba.py system-config-samba-mechanism.py
++PY_SRC_APPS				= addUserWin.py basicPreferencesWin.py mainWindow.py sambaUserWin.py shareWindow.py system-config-samba.py
+ _PY_SRC_APPS			= $(patsubst %,$(PY_SRC_DIR)/%,$(PY_SRC_APPS))
+ PY_SRC_MODULES			= scsamba
+ _PY_SRC_MODULE_FILES	= $(shell find $(patsubst %,$(PY_SRC_DIR)/%,$(PY_SRC_MODULES)) -type f -a -name "*.py")
+@@ -29,20 +20,16 @@ PY_SOURCES				= $(_PY_SRC_APPS) $(_PY_SR
+ 
+ GLADE_SOURCES			= $(wildcard src/*.glade)
+ 
+-PO_SOURCES				= $(PY_SOURCES) $(PO_GLADEH_FILES) $(DESKTOPINH_FILES) $(POLKITINH_FILES)
++PO_SOURCES				= $(PY_SOURCES) $(PO_GLADEH_FILES) $(DESKTOPINH_FILES)
+ 
+-all:	py-build po-all polkit-all desktop-all
++all:	py-build po-all desktop-all
+ 
+-include rpmspec_rules.mk
+ include py_rules.mk
+-include git_rules.mk
+-include upload_rules.mk
+-include polkit_rules.mk
+ include desktop_rules.mk
+ include po_rules.mk
+ include icons_rules.mk
+ 
+-install:	all py-install po-install polkit-install desktop-install \
++install:	all py-install po-install desktop-install \
+ 	icons-install
+ 	install -d $(DESTDIR)$(PKGDATADIR)
+ 	install -d $(DESTDIR)$(BINDIR)
+@@ -53,7 +40,6 @@ install:	all py-install po-install polki
+ 		sed -e s,@VERSION@,$(PKGVERSION),g $${py} > $(DESTDIR)$(PKGDATADIR)/`basename $${py}` ; \
+ 	done
+ 	chmod 0755 $(DESTDIR)$(PKGDATADIR)/system-config-samba.py
+-	chmod 0755 $(DESTDIR)$(PKGDATADIR)/system-config-samba-mechanism.py
+ 	install -m 0644 src/*.glade $(DESTDIR)$(PKGDATADIR)
+ 	softdir=$(PKGDATADIR); \
+ 	if [ -n "$(DESTDIR)" ]; then \
+@@ -64,7 +50,5 @@ install:	all py-install po-install polki
+ 	softdir=$${softdir/#$$p} ; \
+ 	softdir=$${softdir/#\/} ; \
+ 	ln  -fs ../$${softdir}/system-config-samba.py $(DESTDIR)$(BINDIR)/system-config-samba
+-	install -D -m 0644 config/org.fedoraproject.Config.Samba.conf $(DESTDIR)$(DBUS_POLICY_DIR)/org.fedoraproject.Config.Samba.conf
+-	install -D -m 0644 config/org.fedoraproject.Config.Samba.service $(DESTDIR)$(DBUS_SERVICE_DIR)/org.fedoraproject.Config.Samba.service
+ 
+-clean: py-clean po-clean polkit-clean desktop-clean
++clean: py-clean po-clean desktop-clean
+diff -urpN system-config-samba-1.2.100/src/mainWindow.py changed/src/mainWindow.py
+--- system-config-samba-1.2.100/src/mainWindow.py	2013-02-01 15:45:10.000000000 +0100
++++ changed/src/mainWindow.py	2014-07-31 00:39:51.319299654 +0200
+@@ -25,6 +25,7 @@
+ from scsamba.core import sambaConfig
+ from scsamba.core import sambaToken
+ from scsamba.core.sambaParser import SambaParseError
++from scsamba.core import sambaBackend
+ 
+ import gtk
+ import gobject
+@@ -66,16 +67,9 @@ iconName = 'system-config-samba'
+ 
+ 
+ class MainWindow(object):
+-    def __init__(self, debug_flag=False, use_dbus=True):
++    def __init__(self, debug_flag=False):
+         self.debug_flag = debug_flag
+ 
+-        if use_dbus == None:
+-            if os.getuid() != 0 and os.geteuid() != 0:
+-                use_dbus = True
+-            else:
+-                use_dbus = False
+-        self.use_dbus = use_dbus
+-
+         if os.access("system-config-samba.glade", os.F_OK):
+             self.xml = gtk.glade.XML("system-config-samba.glade",
+                     domain="system-config-samba")
+@@ -101,29 +95,8 @@ class MainWindow(object):
+         self.nameTag = _("Samba")
+         self.commentTag = _("Create, modify, and delete samba shares")
+ 
+-        if use_dbus:
+-            # use monkey-patched SystemBus if available to have a default
+-            # method timeout of forever or at least very long
+-            try:
+-                from slip.dbus.bus import SystemBus
+-            except ImportError:
+-                from dbus import SystemBus
+-            import dbus.mainloop.glib
+-
+-            dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+-            self._bus = SystemBus()
+-            self._bus.default_timeout = None
+-
+-            from scsamba.dbus.proxy import sambaBackend
+-
+-            # Initialize smb.conf backend proxy
+-            self.samba_backend = sambaBackend.SambaBackend(bus=self._bus)
+-
+-        else:
+-            from scsamba.core import sambaBackend
+-
+-            # Initialize smb.conf backend
+-            self.samba_backend = sambaBackend.SambaBackend()
++        # Initialize smb.conf backend
++        self.samba_backend = sambaBackend.SambaBackend()
+ 
+         def exp_activate(expander, expander_label):
+             if expander.get_expanded():
+diff -urpN system-config-samba-1.2.100/src/scsamba/core/sambaBackend.py changed/src/scsamba/core/sambaBackend.py
+--- system-config-samba-1.2.100/src/scsamba/core/sambaBackend.py	2013-02-01 15:45:10.000000000 +0100
++++ changed/src/scsamba/core/sambaBackend.py	2014-07-31 00:43:40.601199340 +0200
+@@ -23,7 +23,7 @@
+ 
+ import os
+ import errno
+-from slip.util.files import copyfile
++from shutil import copy
+ 
+ from sambaParser import SambaParser
+ 
+@@ -70,7 +70,7 @@ class SambaBackend(object):
+         try:
+             f = open(self.smb_conf_path, "rb")
+         except IOError:
+-            copyfile(self.smb_conf_template_path, self.smb_conf_path)
++            copy(self.smb_conf_template_path, self.smb_conf_path)
+             f = open(self.smb_conf_path, "rb")
+         filecontents = f.read()
+         f.close()
+diff -urpN system-config-samba-1.2.100/src/setup.py.in changed/src/setup.py.in
+--- system-config-samba-1.2.100/src/setup.py.in	2013-02-01 15:45:10.000000000 +0100
++++ changed/src/setup.py.in	2014-07-30 21:46:16.583670021 +0200
+@@ -8,8 +8,3 @@ setup(
+         packages=["scsamba", "scsamba.core"]
+         )
+ 
+-setup(
+-        name="scsamba.dbus",
+-        version="@VERSION@",
+-        packages=["scsamba.dbus", "scsamba.dbus.service", "scsamba.dbus.proxy"]
+-        )
+diff -urpN system-config-samba-1.2.100/src/system-config-samba.py changed/src/system-config-samba.py
+--- system-config-samba-1.2.100/src/system-config-samba.py	2013-02-01 15:45:10.000000000 +0100
++++ changed/src/system-config-samba.py	2014-07-31 01:14:36.015167725 +0200
+@@ -32,28 +32,21 @@ signal.signal(signal.SIGINT, signal.SIG_
+ import gettext
+ _ = lambda x: unicode(gettext.ldgettext("system-config-samba", x), "utf-8")
+ 
+-debug_flag = "--debug" in sys.argv
+-if "--no-dbus" in sys.argv:
+-    use_dbus = False
+-elif "--dbus" in sys.argv:
+-    use_dbus = True
+-else:
+-    use_dbus = None
+-
+ try:
+     import gtk
+ except:
+-    print >>sys.stderr, _("system-config-samba requires an X-Window display.")
++    print >>sys.stderr, _("There was an error in initializing GTK+. Please make sure a X Server is running.")
+     sys.exit(0)
+ 
+ os.umask(0022)
+ 
+ import mainWindow
+ from scsamba.exc import AuthError
++
+ main_window = None
+ try:
+-    main_window = mainWindow.MainWindow(debug_flag=debug_flag,
+-            use_dbus=use_dbus)
++    debug_flag = "--debug" in sys.argv
++    main_window = mainWindow.MainWindow(debug_flag=debug_flag)
+     if "main" in dir(gtk):
+         gtk.main()
+     else:
+diff -urpN system-config-samba-1.2.100/system-config-samba.desktop.in changed/system-config-samba.desktop.in
+--- system-config-samba-1.2.100/system-config-samba.desktop.in	2013-02-01 15:45:10.000000000 +0100
++++ changed/system-config-samba.desktop.in	2014-07-30 21:35:48.130183290 +0200
+@@ -1,9 +1,9 @@
+ [Desktop Entry]
+-_Name=Samba
++_Name=Samba Server Configuration
+ _Comment=Create, modify, and delete samba shares
+ Categories=System;Settings;
+ Icon=system-config-samba
+-Exec=/usr/bin/system-config-samba
++Exec=gksu /usr/bin/system-config-samba
+ Type=Application
+ StartupNotify=true
+ Terminal=false