summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2012-05-15 14:18:41 +0000
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2012-05-15 14:18:41 +0000
commit9238bb10b5171e29951456e8fe46e6d595b0601b (patch)
treef8f979b3e169d3f7f83a71adbf60ac135f0896b2
parent81b1e353349e9aa92b722ba467cd16a7434155cf (diff)
rapid-tunneling: version 1.14
Bump version to create home directory for rpm -server package. git-svn-id: svn+ssh://xorcom/home/svn/debs/components/rapid-tunneling@10580 283159da-0705-0410-b60c-f2062b4bb6ad
-rw-r--r--debian/changelog6
-rw-r--r--rapid-tunneling.spec17
2 files changed, 19 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 6d0331a..629e717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rapid-tunneling (1.14) unstable; urgency=low
+
+ * Bump version to create home directory for rpm -server package.
+
+ -- Tzafrir Cohen <tzafrir@debian.org> Tue, 15 May 2012 14:55:19 +0300
+
rapid-tunneling (1.13) unstable; urgency=low
* Bump version as previous one had a broken archive in the RPM package.
diff --git a/rapid-tunneling.spec b/rapid-tunneling.spec
index 4773cb8..c8f9f28 100644
--- a/rapid-tunneling.spec
+++ b/rapid-tunneling.spec
@@ -1,6 +1,6 @@
Summary: Xorcom RapidTunneling (tm)
Name: rapid-tunneling
-Version: 1.12
+Version: 1.14
Release: 1
License: GPLv2+
Group: Applications/Internet
@@ -46,6 +46,8 @@ make
make install DESTDIR=%{buildroot}
# The placeholder is needed for debs, but creates an unnecessary file
# conflicts on rpm:
+# The base directory itself is needed to allow 'useradd -m' in post
+# scripts.
%{__rm} -f %{buildroot}/var/lib/rapid-tunneling/.placeholder
%clean
@@ -56,9 +58,10 @@ HOME_DIR=/var/lib/rapid-tunneling/support
NEW_USER=support
NEW_GROUP=$NEW_USER
getent group $NEW_GROUP >/dev/null || groupadd -r $NEW_GROUP
-getent passwd $NEW_USER >/dev/null || \
- useradd -r -g $NEW_GROUP -d $HOME_DIR \
- -c "RapidTunneling support user" $NEW_USER
+if ! getent passwd $NEW_USER >/dev/null; then
+ useradd -r -g $NEW_GROUP -m -d $HOME_DIR \
+ -c "RapidTunneling support user" $NEW_USER
+fi
LINE='. /usr/share/rapid-tunneling/support_env'
PROFILE=$HOME_DIR/.bash_profile
if ! fgrep -q "$LINE" $PROFILE 2>/dev/null; then
@@ -114,6 +117,12 @@ service httpd reload
%config /etc/sudoers.d/rapid-tunneling
%changelog
+* Tue May 15 2012 Tzafrir Cohen <tzafrir.cohen@xorcom.com> 1.14-1
+- Do generate home directory in rapid-tunneling-server.
+
+* Mon Dec 19 2011 Tzafrir Cohen <tzafrir.cohen@xorcom.com> 1.13-1
+- Basically only a rebuild as tarball in 1.12 was broken.
+
* Mon Dec 19 2011 Tzafrir Cohen <tzafrir.cohen@xorcom.com> 1.12-1
- Removed separate rapid-tunneling "user".
- Work around a bug in centos5 sudo: no more permanent "connecting".