Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/71112


Change subject: Package take
......................................................................

Package take

Change-Id: I8ada3b5000be02e5750f7f69a7ca7f8f6caea8f0
---
M Makefile.am
M configure.ac
M debian/misctools.install
M debian/rules
A src/.gitignore
A src/Makefile.am
6 files changed, 17 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/12/71112/1

diff --git a/Makefile.am b/Makefile.am
index 774dde8..3a64156 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = jobutils misctools
+SUBDIRS = jobutils misctools src
diff --git a/configure.ac b/configure.ac
index 3adb2c6..11af986 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,11 +4,13 @@
 AM_INIT_AUTOMAKE([foreign no-dist silent-rules -Wall -Werror])
 AC_PROG_INSTALL
 AC_PROG_LN_S
+AC_PROG_CXX
 
 AC_CONFIG_FILES([Makefile
                  jobutils/Makefile
                  jobutils/bin/Makefile
                  jobutils/man/Makefile
-                 misctools/Makefile])
+                 misctools/Makefile
+                 src/Makefile])
 
 AC_OUTPUT
diff --git a/debian/misctools.install b/debian/misctools.install
index 20e481b..f383236 100644
--- a/debian/misctools.install
+++ b/debian/misctools.install
@@ -1,3 +1,4 @@
 usr/bin/become
+usr/bin/take
 usr/sbin/rmtool
 usr/sbin/toolwatcher
diff --git a/debian/rules b/debian/rules
index cc628e0..29a6355 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,11 @@
 %:
        dh $@ --with autoreconf
 
+# Make take setuid.
+override_dh_fixperms:
+       dh_fixperms
+       chmod u+s debian/misctools/usr/bin/take
+
 # Test that Perl scripts not have compilation errors.
 override_dh_auto_test:
        perl -cw jobutils/bin/job
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..5f96fc7
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,4 @@
+/Makefile
+/Makefile.in
+/take
+/take.o
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..6541b6b
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,3 @@
+bin_PROGRAMS = take
+
+take_SOURCES = take.cc

-- 
To view, visit https://gerrit.wikimedia.org/r/71112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ada3b5000be02e5750f7f69a7ca7f8f6caea8f0
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to