Subject: [alpine-aports] [PATCH 01/15] testing/at: Properly set primary group in .pre-install.

From: Przemyslaw Pawelczyk <[email-masked]>
Date: Mon, 6 Jun 2016 02:05:01 +0200

Fixes the problem I unintentionally brought in commit ccc056dbf9d3:
system user creation doesn't add same named group and uses nogroup as
primary group unless explicitly specified via -G.
---
 testing/at/at.pre-install | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/testing/at/at.pre-install b/testing/at/at.pre-install
index 3803510..78aa4bc 100644
--- a/testing/at/at.pre-install
+++ b/testing/at/at.pre-install
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 addgroup -S at 2>/dev/null
-adduser -S -D -H -s /bin/false -g at at 2>/dev/null
-addgroup at at 2>/dev/null
+adduser -S -D -H -s /bin/false -G at -g at at 2>/dev/null
 
 exit 0
-- 
2.6.6

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Przemyslaw Pawelczyk <[email-masked]>
Date: Mon, 6 Jun 2016 02:05:02 +0200

---
 testing/ejabberd/ejabberd.pre-install | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/ejabberd/ejabberd.pre-install b/testing/ejabberd/ejabberd.pre-install
index 61c3d72..58a48d7 100644
--- a/testing/ejabberd/ejabberd.pre-install
+++ b/testing/ejabberd/ejabberd.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+addgroup -S ejabberd 2>/dev/null
 adduser -S -D -H -h /var/lib/ejabberd -G ejabberd -g ejabberd ejabberd 2>/dev/null
 
 exit 0
-- 
2.6.6

---

---

From: Przemyslaw Pawelczyk <[email-masked]>
Date: Mon, 6 Jun 2016 02:05:03 +0200

There is a further patch in the queue fixing primary group issue.
---
 testing/rrdbot/rrdbot.pre-install | 2 --
 1 file changed, 2 deletions(-)

diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install
index 5d2e03a..d73a197 100644
--- a/testing/rrdbot/rrdbot.pre-install
+++ b/testing/rrdbot/rrdbot.pre-install
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# this user should be included in alpine-baselayout-1.2.
-# included here for backward compability.
 adduser -S -D -H -s /bin/false -g rrdbotd rrdbotd 2>/dev/null
 
 exit 0
-- 
2.6.6

---

---

From: Przemyslaw Pawelczyk <[email-masked]>
Date: Mon, 6 Jun 2016 02:05:04 +0200

Commit fb87e4fd6222 tried to fix problem I unintentionally brought in
commit ccc056dbf9d3 - system user creation doesn't add same named group
and uses nogroup as primary group unless explicitly specified via -G.

Commit a593d306c92f has nothing to do with it, as it only sets GECOS.

I cannot blame anyone (beside myself, obviously, for all this mess) as
-g and -G can be easily misread without conuslting --help output.
---
 main/dovecot/dovecot.pre-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/dovecot/dovecot.pre-install b/main/dovecot/dovecot.pre-install
index e3ee636..213a6a6 100644
--- a/main/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
@@ -2,7 +2,7 @@
 
 addgroup -S dovecot 2>/dev/null
 addgroup -S dovenull 2>/dev/null
-adduser -S -u 90 -D -H -h /dev/null -s /sbin/nologin -g dovecot dovecot 2>/dev/null
-adduser -S -u 91 -D -H -h /dev/null -s /sbin/nologin -g dovenull dovenull 2>/dev/null
+adduser -S -u 90 -D -H -h /dev/null -s /sbin/nologin -G dovecot -g dovecot dovecot 2>/dev/null
+adduser -S -u 91 -D -H -h /dev/null -s /sbin/nologin -G dovenull -g dovenull dovenull 2>/dev/null
 
 exit 0
-- 
2.6.6

---

---

From: Przemyslaw Pawelczyk <[email-masked]>
Date: Mon, 6 Jun 2016 02:05:05 +0200

Fixes the problem I unintentionally brought in commit ccc056dbf9d3:
system user creation doesn't add same named group and uses nogroup as
primary group unless explicitly specified via -G.
---
 main/nrpe/nrpe.pre-install         | 2 +-
 main/postgrey/postgrey.pre-install | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/nrpe/nrpe.pre-install b/main/nrpe/nrpe.pre-install
index 875a9fa..0b519f5 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /dev/null -s /sbin/nologin -g nagios nagios 2>/dev/null
 addgroup -S nagios 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G nagios -g nagios nagios 2>/dev/null
 
 exit 0
diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install
index 5f1d560..bb42696 100644
--- a/main/postgrey/postgrey.pre-install
+++ b/main/postgrey/postgrey.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S postgrey 2>/dev/null
-adduser -S -D -H -h /dev/null -s /sbin/nologin -g postgrey postgrey 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G postgrey -g postgrey postgrey 2>/dev/null
 
 exit 0
-- 
2.6.6

---

---

From: Przemyslaw Pawelczyk <[email-masked]>
Date: Mon, 6 Jun 2016 02:05:06 +0200

Somehow I overlooked this adduser call in mentioned commit.
---
 main/ympd/ympd.pre-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/ympd/ympd.pre-install b/main/ympd/ympd.pre-install
index a9a6edb..27eb617 100644
--- a/main/ympd/ympd.pre-install
+++ b/main/ympd/ympd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -D -s /sbin/nologin -G audio -g ympd ympd 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G audio -g ympd ympd 2>/dev/null
 
 exit 0
-- 
2.6.6

---

---

From: Przemyslaw Pawelczyk <[email-masked]>
Date: Mon, 6 Jun 2016 02:05:07 +0200

There is a further patch in the queue fixing primary group issue.
---
 main/znc/znc.pre-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/znc/znc.pre-install b/main/znc/znc.pre-install
index 17c3bbc..bc81d8a 100644
--- a/main/znc/znc.pre-install
+++ b/main/znc/znc.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -D -s /sbin/nologin -g znc znc 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g znc znc 2>/dev/null
 
 exit 0
-- 
2.6.6

---

---

From: Przemyslaw Pawelczyk <[email-masked]>
Date: Mon, 6 Jun 2016 02:05:08 +0200

There is a further patch in the queue fixing primary group issue.
---
 main/aports-build/aports-build.pre-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/aports-build/aports-build.pre-install b/main/aports-build/aports-build.pre-install
index 2fdf497..4fcbdd4 100644
--- a/main/aports-build/aports-build.pre-install
+++ b/main/aports-build/aports-build.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -D -g buildozer buildozer -s /bin/sh 2>/dev/null
+adduser -S -D -s /bin/sh -g buildozer buildozer 2>/dev/null
 
 exit 0
-- 
2.6.6

---

---

From: Przemyslaw Pawelczyk <[email-masked]>
Date: Mon, 6 Jun 2016 02:05:09 +0200

There is a further patch in the queue fixing primary group issue.
---
 main/atheme-iris/atheme-iris.pre-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/atheme-iris/atheme-iris.pre-install b/main/atheme-iris/atheme-iris.pre-install
index 490ba08..ce2d521 100644
--- a/main/atheme-iris/atheme-iris.pre-install
+++ b/main/atheme-iris/atheme-iris.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -D -H -h /usr/share/webapps/atheme-iris -s /sbin/nologin -g iris iris >/dev/null
+adduser -S -D -H -h /usr/share/webapps/atheme-iris -s /sbin/nologin -g iris iris 2>/dev/null
 
 exit 0
-- 
2.6.6

---

---

From: Przemyslaw Pawelczyk <[email-masked]>
Date: Mon, 6 Jun 2016 02:05:10 +0200

Brings status quo regarding primary groups of users created in packages:
- main/apache2
- main/aports-build
- main/atheme-iris
- main/clamav
- main/clamsmtp
- main/coova-chilli
- main/dhcp
- main/djbdns
- main/ez-ipupdate
- main/fetchmail
- main/freeswitch
- main/gitolite
- main/gnats
- main/gross
- main/icecast
- main/memcached
- main/ngircd
- main/openntpd
- main/snort
- main/squid
- main/transmission
- main/znc
---
 main/apache2/apache2.pre-install                  | 3 ++-
 main/aports-build/aports-build.pre-install        | 3 ++-
 main/atheme-iris/atheme-iris.pre-install          | 3 ++-
 main/clamav/clamav-db.pre-install                 | 3 ++-
 main/clamsmtp/clamsmtp.pre-install                | 3 ++-
 main/clamsmtp/clamsmtp.pre-upgrade                | 3 ++-
 main/coova-chilli/coova-chilli.pre-install        | 3 ++-
 main/dhcp/dhcp.pre-install                        | 3 ++-
 main/djbdns/dnscache.pre-install                  | 3 ++-
 main/djbdns/tinydns.pre-install                   | 3 ++-
 main/ez-ipupdate/ez-ipupdate.pre-install          | 3 ++-
 main/fetchmail/fetchmail.pre-install              | 3 ++-
 main/freeswitch/freeswitch.pre-install            | 3 ++-
 main/gitolite/gitolite.pre-install                | 3 ++-
 main/gnats/gnats.pre-install                      | 3 ++-
 main/gross/gross.pre-install                      | 3 ++-
 main/icecast/icecast.pre-install                  | 3 ++-
 main/memcached/memcached.pre-install              | 3 ++-
 main/ngircd/ngircd.pre-install                    | 3 ++-
 main/openntpd/openntpd.pre-install                | 3 ++-
 main/snort/snort.pre-install                      | 3 ++-
 main/squid/squid.pre-install                      | 3 ++-
 main/squid/squid.pre-upgrade                      | 3 ++-
 main/transmission/transmission-daemon.pre-install | 3 ++-
 main/znc/znc.pre-install                          | 3 ++-
 25 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index 703681e..d4ede74 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -D -H -h /var/www -s /sbin/nologin -g apache apache 2>/dev/null
+addgroup -S apache 2>/dev/null
+adduser -S -D -H -h /var/www -s /sbin/nologin -G apache -g apache apache 2>/dev/null
 addgroup apache www-data 2>/dev/null
 
 exit 0
diff --git a/main/aports-build/aports-build.pre-install b/main/aports-build/aports-build.pre-install
index 4fcbdd4..72c62b4 100644
--- a/main/aports-build/aports-build.pre-install
+++ b/main/aports-build/aports-build.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -s /bin/sh -g buildozer buildozer 2>/dev/null
+addgroup -S buildozer 2>/dev/null
+adduser -S -D -s /bin/sh -G buildozer -g buildozer buildozer 2>/dev/null
 
 exit 0
diff --git a/main/atheme-iris/atheme-iris.pre-install b/main/atheme-iris/atheme-iris.pre-install
index ce2d521..aa18cf5 100644
--- a/main/atheme-iris/atheme-iris.pre-install
+++ b/main/atheme-iris/atheme-iris.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /usr/share/webapps/atheme-iris -s /sbin/nologin -g iris iris 2>/dev/null
+addgroup -S iris 2>/dev/null
+adduser -S -D -H -h /usr/share/webapps/atheme-iris -s /sbin/nologin -G iris -g iris iris 2>/dev/null
 
 exit 0
diff --git a/main/clamav/clamav-db.pre-install b/main/clamav/clamav-db.pre-install
index d1e52fb..fdb83a0 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -s /sbin/nologin -g clamav clamav 2>/dev/null
+addgroup -S clamav 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G clamav -g clamav clamav 2>/dev/null
 
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-install b/main/clamsmtp/clamsmtp.pre-install
index d1e52fb..fdb83a0 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -s /sbin/nologin -g clamav clamav 2>/dev/null
+addgroup -S clamav 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G clamav -g clamav clamav 2>/dev/null
 
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade
index 959576d..c397bfc 100644
--- a/main/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
@@ -10,6 +10,7 @@ if [ -f "$old" ] && [ ! -f "$new" ]; then
 	echo " *"
 fi
 
-adduser -S -D -H -s /bin/false -g clamav clamav 2>/dev/null
+addgroup -S clamav 2>/dev/null
+adduser -S -D -H -s /bin/false -G clamav -g clamav clamav 2>/dev/null
 
 exit 0
diff --git a/main/coova-chilli/coova-chilli.pre-install b/main/coova-chilli/coova-chilli.pre-install
index bf6ea4c..342778d 100644
--- a/main/coova-chilli/coova-chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -s /sbin/nologin -g chilli chilli 2>/dev/null
+addgroup -S chilli 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G chilli -g chilli chilli 2>/dev/null
 
 exit 0
diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install
index 2e0b839..6aa3de0 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -h /var/lib/dhcp -s /sbin/nologin -g dhcp dhcp 2>/dev/null
+addgroup -S dhcp 2>/dev/null
+adduser -S -D -h /var/lib/dhcp -s /sbin/nologin -G dhcp -g dhcp dhcp 2>/dev/null
 
 exit 0
diff --git a/main/djbdns/dnscache.pre-install b/main/djbdns/dnscache.pre-install
index 664732c..f59549a 100644
--- a/main/djbdns/dnscache.pre-install
+++ b/main/djbdns/dnscache.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /etc/dnscache -g dnscache -s /sbin/nologin dnscache 2>/dev/null
+addgroup -S dnscache 2>/dev/null
+adduser -S -D -H -h /etc/dnscache -G dnscache -g dnscache -s /sbin/nologin dnscache 2>/dev/null
 
 exit 0
diff --git a/main/djbdns/tinydns.pre-install b/main/djbdns/tinydns.pre-install
index 85ba7e7..da47789 100644
--- a/main/djbdns/tinydns.pre-install
+++ b/main/djbdns/tinydns.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /etc/tinydns -s /sbin/nologin -g tinydns tinydns 2>/dev/null
+addgroup -S tinydns 2>/dev/null
+adduser -S -D -H -h /etc/tinydns -s /sbin/nologin -G tinydns -g tinydns tinydns 2>/dev/null
 
 exit 0
diff --git a/main/ez-ipupdate/ez-ipupdate.pre-install b/main/ez-ipupdate/ez-ipupdate.pre-install
index 11b4c57..8d33acc 100644
--- a/main/ez-ipupdate/ez-ipupdate.pre-install
+++ b/main/ez-ipupdate/ez-ipupdate.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -h /var/lib/ez-ipupdate -s /sbin/nologin -g ipupdate ipupdate 2>/dev/null
+addgroup -S ipupdate 2>/dev/null
+adduser -S -D -h /var/lib/ez-ipupdate -s /sbin/nologin -G ipupdate -g ipupdate ipupdate 2>/dev/null
 
 exit 0
diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
index ed3d409..ef46a10 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /var/lib/fetchmail -s /sbin/nologin -g fetchmail fetchmail 2>/dev/null
+addgroup -S fetchmail 2>/dev/null
+adduser -S -D -H -h /var/lib/fetchmail -s /sbin/nologin -G fetchmail -g fetchmail fetchmail 2>/dev/null
 
 exit 0
diff --git a/main/freeswitch/freeswitch.pre-install b/main/freeswitch/freeswitch.pre-install
index 6f31b67..a7790e9 100755
--- a/main/freeswitch/freeswitch.pre-install
+++ b/main/freeswitch/freeswitch.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /var/run/freeswitch -s /sbin/nologin -g freeswitch freeswitch 2>/dev/null
+addgroup -S freeswitch 2>/dev/null
+adduser -S -D -H -h /var/run/freeswitch -s /sbin/nologin -G freeswitch -g freeswitch freeswitch 2>/dev/null
 
 exit 0
diff --git a/main/gitolite/gitolite.pre-install b/main/gitolite/gitolite.pre-install
index 506ef1d..eadbf73 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /var/lib/git -s /bin/sh -g git git 2>/dev/null
+addgroup -S git 2>/dev/null
+adduser -S -D -H -h /var/lib/git -s /bin/sh -G git -g git git 2>/dev/null
 
 exit 0
diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
index e3a4de0..7e46b87 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -h /var/lib/gnatsdb -g gnats gnats 2>/dev/null
+addgroup -S gnats 2>/dev/null
+adduser -S -D -h /var/lib/gnatsdb -G gnats -g gnats gnats 2>/dev/null
 
 exit 0
diff --git a/main/gross/gross.pre-install b/main/gross/gross.pre-install
index 078372d..2a3db3c 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -s /sbin/nologin -g gross gross 2>/dev/null
+addgroup -S gross 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G gross -g gross gross 2>/dev/null
 
 exit 0
diff --git a/main/icecast/icecast.pre-install b/main/icecast/icecast.pre-install
index 3ee9c4a..1951890 100644
--- a/main/icecast/icecast.pre-install
+++ b/main/icecast/icecast.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -h /var/log/icecast -s /sbin/nologin -g icecast icecast 2>/dev/null
+addgroup -S icecast 2>/dev/null
+adduser -S -D -h /var/log/icecast -s /sbin/nologin -G icecast -g icecast icecast 2>/dev/null
 
 exit 0
diff --git a/main/memcached/memcached.pre-install b/main/memcached/memcached.pre-install
index 8ff0274..87b6ba9 100644
--- a/main/memcached/memcached.pre-install
+++ b/main/memcached/memcached.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -s /sbin/nologin -g memcached memcached 2>/dev/null
+addgroup -S memcached 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G memcached -g memcached memcached 2>/dev/null
 
 exit 0
diff --git a/main/ngircd/ngircd.pre-install b/main/ngircd/ngircd.pre-install
index c073447..49dd9d5 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /etc/ngircd -s /sbin/nologin -g ngircd ngircd 2>/dev/null
+addgroup ngircd 2>/dev/null
+adduser -S -D -H -h /etc/ngircd -s /sbin/nologin -G ngircd -g ngircd ngircd 2>/dev/null
 
 exit 0
diff --git a/main/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install
index 6b8204b..975bf54 100644
--- a/main/openntpd/openntpd.pre-install
+++ b/main/openntpd/openntpd.pre-install
@@ -2,6 +2,7 @@
 
 # this user should be included in alpine-baselayout-1.2.
 # included here for backward compability.
-adduser -S -D -H -h /var/empty -s /sbin/nologin -g ntp ntp 2>/dev/null
+addgroup -S ntp 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -G ntp -g ntp ntp 2>/dev/null
 
 exit 0
diff --git a/main/snort/snort.pre-install b/main/snort/snort.pre-install
index e40838d..3b762d5 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -h /var/log/snort -s /sbin/nologin -g snort snort 2>/dev/null
+addgroup -S snort 2>/dev/null
+adduser -S -D -h /var/log/snort -s /sbin/nologin -G snort -g snort snort 2>/dev/null
 
 exit 0
diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install
index f613759..3c49c86 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -h /var/cache/squid -g squid squid 2>/dev/null
+addgroup -S squid 2>/dev/null
+adduser -S -D -h /var/cache/squid -G squid -g squid squid 2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup squid winbind 2>/dev/null
 
diff --git a/main/squid/squid.pre-upgrade b/main/squid/squid.pre-upgrade
index f613759..3c49c86 100644
--- a/main/squid/squid.pre-upgrade
+++ b/main/squid/squid.pre-upgrade
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -h /var/cache/squid -g squid squid 2>/dev/null
+addgroup -S squid 2>/dev/null
+adduser -S -D -h /var/cache/squid -G squid -g squid squid 2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup squid winbind 2>/dev/null
 
diff --git a/main/transmission/transmission-daemon.pre-install b/main/transmission/transmission-daemon.pre-install
index ad8a575..2e26d48 100644
--- a/main/transmission/transmission-daemon.pre-install
+++ b/main/transmission/transmission-daemon.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -h /var/lib/transmission -s /sbin/nologin -g transmission transmission 2>/dev/null
+addgroup -S transmission 2>/dev/null
+adduser -S -D -h /var/lib/transmission -s /sbin/nologin -G transmission -g transmission transmission 2>/dev/null
 
 exit 0
diff --git a/main/znc/znc.pre-install b/main/znc/znc.pre-install
index bc81d8a..c47e5e1 100644
--- a/main/znc/znc.pre-install
+++ b/main/znc/znc.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -s /sbin/nologin -g znc znc 2>/dev/null
+addgroup -S znc 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G znc -g znc znc 2>/dev/null
 
 exit 0
-- 
2.6.6

---

---

From: Przemyslaw Pawelczyk <[email-masked]>
Date: Mon, 6 Jun 2016 02:05:11 +0200

Brings status quo regarding primary groups of users created in packages:
- community/caddy
- community/domoticz
- community/oscam
- community/syncthing
---
 community/caddy/caddy.pre-install         | 3 ++-
 community/domoticz/domoticz.pre-install   | 3 ++-
 community/oscam/oscam.pre-install         | 3 ++-
 community/syncthing/syncthing.pre-install | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install
index ccb4f07..0830288 100644
--- a/community/caddy/caddy.pre-install
+++ b/community/caddy/caddy.pre-install
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -h /var/lib/caddy -s /sbin/nologin -g caddy caddy 2>/dev/null
+addgroup -S caddy 2>/dev/null
+adduser -S -D -h /var/lib/caddy -s /sbin/nologin -G caddy -g caddy caddy 2>/dev/null
 adduser caddy www-data 2>/dev/null
 
 exit 0
diff --git a/community/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install
index 2272067..6be1d39 100644
--- a/community/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -h /var/lib/domoticz -s /sbin/nologin -g domoticz domoticz 2>/dev/null
+addgroup -S domoticz 2>/dev/null
+adduser -S -D -h /var/lib/domoticz -s /sbin/nologin -G domoticz -g domoticz domoticz 2>/dev/null
 
 exit 0
diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install
index a9982c7..cce6bcd 100644
--- a/community/oscam/oscam.pre-install
+++ b/community/oscam/oscam.pre-install
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -H -s /sbin/nologin -g oscam oscam 2>/dev/null
+addgroup -S oscam 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G oscam -g oscam oscam 2>/dev/null
 addgroup oscam usb 2>/dev/null
 
 exit 0
diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install
index a2ee46c..685d7ed 100644
--- a/community/syncthing/syncthing.pre-install
+++ b/community/syncthing/syncthing.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /var/lib/syncthing -s /sbin/nologin -g syncthing syncthing 2>/dev/null
+addgroup -S syncthing 2>/dev/null
+adduser -S -D -H -h /var/lib/syncthing -s /sbin/nologin -G syncthing -g syncthing syncthing 2>/dev/null
 
 exit 0
-- 
2.6.6

---

---

From: Przemyslaw Pawelczyk <[email-masked]>
Date: Mon, 6 Jun 2016 02:05:12 +0200

Brings status quo regarding primary groups of users created in packages:
- testing/dbmail
- testing/dspam
- testing/opensips
- testing/pdns
- testing/qpage
- testing/rrdbot
- testing/wt
---
 testing/dbmail/dbmail.pre-install     | 3 ++-
 testing/dspam/dspam.pre-install       | 3 ++-
 testing/opensips/opensips.pre-install | 3 ++-
 testing/pdns/pdns.pre-install         | 3 ++-
 testing/qpage/qpage.pre-install       | 3 ++-
 testing/rrdbot/rrdbot.pre-install     | 3 ++-
 testing/wt/wt.pre-install             | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/testing/dbmail/dbmail.pre-install b/testing/dbmail/dbmail.pre-install
index 21650fc..8a36d15 100644
--- a/testing/dbmail/dbmail.pre-install
+++ b/testing/dbmail/dbmail.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /var/lib/dbmail -s /bin/false -g dbmail dbmail 2>/dev/null
+addgroup -S dbmail 2>/dev/null
+adduser -S -D -H -h /var/lib/dbmail -s /bin/false -G dbmail -g dbmail dbmail 2>/dev/null
 
 exit 0
diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install
index e78f1e6..8cffce8 100644
--- a/testing/dspam/dspam.pre-install
+++ b/testing/dspam/dspam.pre-install
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -h /var/lib/dspam -s /bin/false -g dspam dspam 2>/dev/null
+addgroup -S dspam 2>/dev/null
+adduser -S -D -h /var/lib/dspam -s /bin/false -G dspam -g dspam dspam 2>/dev/null
 chown dspam:dspam /var/lib/dspam
 
 exit 0
diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install
index 8eebc7b..1fcd8dc 100644
--- a/testing/opensips/opensips.pre-install
+++ b/testing/opensips/opensips.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /var/empty -s /bin/false -g opensips opensips 2>/dev/null
+addgroup -S opensips 2>/dev/null
+adduser -S -D -H -h /var/empty -s /bin/false -G opensips -g opensips opensips 2>/dev/null
 
 exit 0
diff --git a/testing/pdns/pdns.pre-install b/testing/pdns/pdns.pre-install
index e80add6..021b1e7 100644
--- a/testing/pdns/pdns.pre-install
+++ b/testing/pdns/pdns.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /var/empty -s /bin/false -g pdns pdns 2>/dev/null
+addgroup -S pdns 2>/dev/null
+adduser -S -D -H -h /var/empty -s /bin/false -G pdns -g pdns pdns 2>/dev/null
 
 exit 0
diff --git a/testing/qpage/qpage.pre-install b/testing/qpage/qpage.pre-install
index 45f03d0..c73b800 100644
--- a/testing/qpage/qpage.pre-install
+++ b/testing/qpage/qpage.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -h /var/lib/qpage -s /bin/false -G qpage -g qpage qpage 2>/dev/null
+addgroup -S qpage 2>/dev/null
+adduser -S -D -h /var/lib/qpage -s /bin/false -G qpage -G qpage -g qpage qpage 2>/dev/null
 
 exit 0
diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install
index d73a197..4394576 100644
--- a/testing/rrdbot/rrdbot.pre-install
+++ b/testing/rrdbot/rrdbot.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -s /bin/false -g rrdbotd rrdbotd 2>/dev/null
+addgroup -S rrdbotd 2>/dev/null
+adduser -S -D -H -s /bin/false -G rrdbotd -g rrdbotd rrdbotd 2>/dev/null
 
 exit 0
diff --git a/testing/wt/wt.pre-install b/testing/wt/wt.pre-install
index b007724..35ff869 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -D -H -s /sbin/nologin -g wt wt 2>/dev/null
+addgroup -S wt 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G wt -g wt wt 2>/dev/null
 addgroup wt www-data 2>/dev/null
 
 exit 0
-- 
2.6.6

---

---

From: Przemyslaw Pawelczyk <[email-masked]>
Date: Mon, 6 Jun 2016 02:05:13 +0200

* main/dovecot: Properly set primary group in .pre-install.
main/dovecot/dovecot.pre-install

* main/{npre,postgrey}: Properly set primary group in .pre-install.
main/nrpe/nrpe.pre-install
main/postgrey/postgrey.pre-install

* main/ympd: Reorder arguments in .pre-install as in da4e96aacef5.
main/ympd/ympd.pre-install

* main/znc: Reorder arguments in .pre-install as in da4e96aacef5.
main/znc/znc.pre-install

* main/aports-build: Reorder arguments in .pre-install as in da4e96aacef5.
main/aports-build/aports-build.pre-install

* main/atheme-iris: Fix overlooked consistency issue as in a60b9f07dee0.
main/atheme-iris/atheme-iris.pre-install

* main/[various]: Add group and use it as primary in .pre-* scripts.
main/apache2/apache2.pre-install
main/aports-build/aports-build.pre-install
main/atheme-iris/atheme-iris.pre-install
main/clamav/clamav-db.pre-install
main/clamsmtp/clamsmtp.pre-install
main/clamsmtp/clamsmtp.pre-upgrade
main/coova-chilli/coova-chilli.pre-install
main/dhcp/dhcp.pre-install
main/djbdns/dnscache.pre-install
main/djbdns/tinydns.pre-install
main/ez-ipupdate/ez-ipupdate.pre-install
main/fetchmail/fetchmail.pre-install
main/freeswitch/freeswitch.pre-install
main/gitolite/gitolite.pre-install
main/gnats/gnats.pre-install
main/gross/gross.pre-install
main/icecast/icecast.pre-install
main/memcached/memcached.pre-install
main/ngircd/ngircd.pre-install
main/openntpd/openntpd.pre-install
main/snort/snort.pre-install
main/squid/squid.pre-install
main/squid/squid.pre-upgrade
main/transmission/transmission-daemon.pre-install
main/znc/znc.pre-install
---
 main/apache2/APKBUILD      | 2 +-
 main/aports-build/APKBUILD | 2 +-
 main/atheme-iris/APKBUILD  | 2 +-
 main/clamav/APKBUILD       | 2 +-
 main/clamsmtp/APKBUILD     | 2 +-
 main/coova-chilli/APKBUILD | 2 +-
 main/dhcp/APKBUILD         | 2 +-
 main/djbdns/APKBUILD       | 2 +-
 main/dovecot/APKBUILD      | 2 +-
 main/ez-ipupdate/APKBUILD  | 2 +-
 main/fetchmail/APKBUILD    | 2 +-
 main/freeswitch/APKBUILD   | 2 +-
 main/gitolite/APKBUILD     | 2 +-
 main/gnats/APKBUILD        | 2 +-
 main/gross/APKBUILD        | 2 +-
 main/icecast/APKBUILD      | 2 +-
 main/memcached/APKBUILD    | 2 +-
 main/ngircd/APKBUILD       | 2 +-
 main/nrpe/APKBUILD         | 2 +-
 main/openntpd/APKBUILD     | 2 +-
 main/postgrey/APKBUILD     | 2 +-
 main/snort/APKBUILD        | 2 +-
 main/squid/APKBUILD        | 2 +-
 main/transmission/APKBUILD | 2 +-
 main/ympd/APKBUILD         | 2 +-
 main/znc/APKBUILD          | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 30ef6da..75f1b4d 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=apache2
 _pkgreal=httpd
 pkgver=2.4.20
-pkgrel=0
+pkgrel=1
 pkgdesc="A high performance Unix-based HTTP server"
 url="http://httpd.apache.org/"
 arch="all"
diff --git a/main/aports-build/APKBUILD b/main/aports-build/APKBUILD
index 5826712..e59489d 100644
--- a/main/aports-build/APKBUILD
+++ b/main/aports-build/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=aports-build
 pkgver=1.0
-pkgrel=6
+pkgrel=7
 pkgdesc="MQTT based build-on-git-push scripts for Alpine Linux"
 url="http://alpinelinux.org"
 arch="noarch"
diff --git a/main/atheme-iris/APKBUILD b/main/atheme-iris/APKBUILD
index 11def6c..9622423 100644
--- a/main/atheme-iris/APKBUILD
+++ b/main/atheme-iris/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <[email-masked]>
 pkgname=atheme-iris
 pkgver=0_git20160428
-pkgrel=1
+pkgrel=2
 pkgdesc="AJAX IRC client. It is a drop-in replacement for qwebirc."
 url="http://www.atheme.net/iris.html"
 arch="noarch"
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index 5c4c21b..4b93cab 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Carlo Landmeter <[email-masked]>
 pkgname=clamav
 pkgver=0.99.2
-pkgrel=0
+pkgrel=1
 pkgusers="clamav"
 pkggroups="clamav"
 pkgdesc="An anti-virus toolkit for UNIX eis-ng backport"
diff --git a/main/clamsmtp/APKBUILD b/main/clamsmtp/APKBUILD
index 6b243e1..6e6a62e 100644
--- a/main/clamsmtp/APKBUILD
+++ b/main/clamsmtp/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Carlo Landmeter <[email-masked]>
 pkgname=clamsmtp
 pkgver=1.10
-pkgrel=14
+pkgrel=15
 pkgdesc="An SMTP Virus Filter"
 url="http://thewalter.net/stef/software/clamsmtp/"
 arch="all"
diff --git a/main/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
index 84f5b1d..c06edc2 100644
--- a/main/coova-chilli/APKBUILD
+++ b/main/coova-chilli/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Leonardo Arena <[email-masked]>
 pkgname=coova-chilli
 pkgver=1.3.0
-pkgrel=6
+pkgrel=7
 pkgdesc="CoovaChilli is an open source access controller for wireless LAN"
 url="http://www.coova.org/"
 arch="all"
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 6394c08..7212233 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=dhcp
 pkgver=4.3.4
 _realver=${pkgver/_p/-P}
-pkgrel=1
+pkgrel=2
 pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
 url="https://www.isc.org/"
 arch="all"
diff --git a/main/djbdns/APKBUILD b/main/djbdns/APKBUILD
index 198c237..bcb67a1 100644
--- a/main/djbdns/APKBUILD
+++ b/main/djbdns/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=djbdns
 pkgver=1.05
-pkgrel=46
+pkgrel=47
 pkgdesc="Excellent high-performance DNS services"
 url="http://cr.yp.to/djbdns.html"
 arch="all"
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index cc1686c..d228368 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=dovecot
 pkgver=2.2.24
-pkgrel=0
+pkgrel=1
 _pigeonholever=0.4.14
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
diff --git a/main/ez-ipupdate/APKBUILD b/main/ez-ipupdate/APKBUILD
index 4a39b2d..5fd1740 100644
--- a/main/ez-ipupdate/APKBUILD
+++ b/main/ez-ipupdate/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jeremy Thomerson <[email-masked]>
 pkgname=ez-ipupdate
 pkgver=3.0.10
-pkgrel=8
+pkgrel=9
 pkgdesc="utility for updating your host name for many of the dynamic DNS services (ez-ip.net, dyndns.org, etc)"
 url="http://ez-ipupdate.com/"
 arch="all"
diff --git a/main/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
index 4ffce1f..155ff3c 100644
--- a/main/fetchmail/APKBUILD
+++ b/main/fetchmail/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=fetchmail
 pkgver=6.3.26
-pkgrel=8
+pkgrel=9
 pkgdesc="A remote-mail retrieval and forwarding utility"
 url="http://www.fetchmail.info/"
 arch="all"
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 76e4df8..583f702 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Cameron Banta <[email-masked]>
 pkgname=freeswitch
 pkgver=1.6.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A communications platform written in C from the ground up"
 url="http://www.freeswitch.org"
 arch="all"
diff --git a/main/gitolite/APKBUILD b/main/gitolite/APKBUILD
index d8a2995..f837a4a 100644
--- a/main/gitolite/APKBUILD
+++ b/main/gitolite/APKBUILD
@@ -4,7 +4,7 @@
 
 pkgname=gitolite
 pkgver=3.6.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Centralized git server, with very fine-grained access control and many powerful features'
 url='http://github.com/sitaramc/gitolite'
 arch='noarch'
diff --git a/main/gnats/APKBUILD b/main/gnats/APKBUILD
index 3213067..7c5892e 100644
--- a/main/gnats/APKBUILD
+++ b/main/gnats/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=gnats
 pkgver=4.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNU Bug Tracking System"
 url="http://www.gnu.org/software/gnats/"
 arch="all"
diff --git a/main/gross/APKBUILD b/main/gross/APKBUILD
index 38fb7bd..2758969 100644
--- a/main/gross/APKBUILD
+++ b/main/gross/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=gross
 pkgver=1.0.2
-pkgrel=9
+pkgrel=10
 pkgdesc="Greylisting of suspicious sources"
 url="http://code.google.com/p/gross/"
 arch="all"
diff --git a/main/icecast/APKBUILD b/main/icecast/APKBUILD
index 41907a4..7166974 100644
--- a/main/icecast/APKBUILD
+++ b/main/icecast/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:  Francesco Colista <[email-masked]>
 pkgname=icecast
 pkgver=2.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Open source media server"
 url="http://www.icecast.org"
 arch="all"
diff --git a/main/memcached/APKBUILD b/main/memcached/APKBUILD
index d60d904..1aa56a0 100644
--- a/main/memcached/APKBUILD
+++ b/main/memcached/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=memcached
 pkgver=1.4.25
-pkgrel=1
+pkgrel=2
 pkgdesc="Distributed memory object caching system"
 url="http://memcached.org"
 arch="all"
diff --git a/main/ngircd/APKBUILD b/main/ngircd/APKBUILD
index 359f495..1eeac62 100644
--- a/main/ngircd/APKBUILD
+++ b/main/ngircd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=ngircd
 pkgver=23
-pkgrel=1
+pkgrel=2
 pkgdesc="Next Generation IRC Daemon"
 url="http://ngircd.barton.de/"
 arch="all"
diff --git a/main/nrpe/APKBUILD b/main/nrpe/APKBUILD
index 232cc77..8d0a0f1 100644
--- a/main/nrpe/APKBUILD
+++ b/main/nrpe/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jeff Bilyk <[email-masked]> 
 pkgname=nrpe
 pkgver=2.15
-pkgrel=2
+pkgrel=3
 pkgusers="nagios"
 pkggroups="nagios"
 pkgdesc="NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines."
diff --git a/main/openntpd/APKBUILD b/main/openntpd/APKBUILD
index d6b1113..b90d58e 100644
--- a/main/openntpd/APKBUILD
+++ b/main/openntpd/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=openntpd
 pkgver=6.0_p1
 _myver=${pkgver/_/}
-pkgrel=0
+pkgrel=1
 pkgdesc="Lightweight NTP server ported from OpenBSD"
 url="http://www.openntpd.org/"
 subpackages="openntpd-doc"
diff --git a/main/postgrey/APKBUILD b/main/postgrey/APKBUILD
index d58b4be..f332d50 100644
--- a/main/postgrey/APKBUILD
+++ b/main/postgrey/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Mason <[email-masked]>
 pkgname=postgrey
 pkgver=1.36
-pkgrel=1
+pkgrel=2
 pkgdesc="Postfix policy server implementing greylisting"
 url="http://postgrey.schweikert.ch/"
 arch="noarch"
diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD
index 2104d84..9d8b8b8 100644
--- a/main/snort/APKBUILD
+++ b/main/snort/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=snort
 pkgver=2.9.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source network intrusion prevention and detection system"
 url="http://www.snort.org/"
 arch="all"
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index 8be9b3f..1750350 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=squid
 pkgver=3.5.19
-pkgrel=0
+pkgrel=1
 pkgdesc="A full-featured Web proxy cache server."
 url="http://www.squid-cache.org"
 install="squid.pre-install squid.pre-upgrade"
diff --git a/main/transmission/APKBUILD b/main/transmission/APKBUILD
index 637bb8e..8d9119a 100644
--- a/main/transmission/APKBUILD
+++ b/main/transmission/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer:Carlo Landmeter
 pkgname=transmission
 pkgver=2.92
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight GTK BitTorrent client"
 url="http://www.tansmissionbt.com"
 install="transmission-daemon.pre-install transmission-daemon.post-upgrade"
diff --git a/main/ympd/APKBUILD b/main/ympd/APKBUILD
index 94cd53c..7a11898 100644
--- a/main/ympd/APKBUILD
+++ b/main/ympd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=ympd
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A standalone MPD Web GUI"
 url="http://www.ympd.org/"
 arch="all"
diff --git a/main/znc/APKBUILD b/main/znc/APKBUILD
index ae5595b..f4896e2 100644
--- a/main/znc/APKBUILD
+++ b/main/znc/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=znc
 pkgver=1.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="An advanced IRC bouncer"
 url="http://znc.in"
 arch="all"
-- 
2.6.6

---

---

From: Przemyslaw Pawelczyk <[email-masked]>
Date: Mon, 6 Jun 2016 02:05:14 +0200

* community/[various]: Add group and use it as primary in .pre-* scripts.
community/caddy/caddy.pre-install
community/domoticz/domoticz.pre-install
community/oscam/oscam.pre-install
community/syncthing/syncthing.pre-install
---
 community/caddy/APKBUILD     | 2 +-
 community/domoticz/APKBUILD  | 2 +-
 community/oscam/APKBUILD     | 2 +-
 community/syncthing/APKBUILD | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/community/caddy/APKBUILD b/community/caddy/APKBUILD
index 3082d0a..797d2e0 100644
--- a/community/caddy/APKBUILD
+++ b/community/caddy/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Carlo Landmeter <[email-masked]>
 pkgname=caddy
 pkgver=0.8.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
 url="https://caddyserver.com/"
 arch="all"
diff --git a/community/domoticz/APKBUILD b/community/domoticz/APKBUILD
index f4ab197..22b5057 100644
--- a/community/domoticz/APKBUILD
+++ b/community/domoticz/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=domoticz
 pkgver=3.4834
-pkgrel=2
+pkgrel=3
 pkgdesc="Open source Home Automation System"
 url="http://www.domoticz.com/"
 arch="x86 x86_64"
diff --git a/community/oscam/APKBUILD b/community/oscam/APKBUILD
index 9a996fa..cadcd0f 100644
--- a/community/oscam/APKBUILD
+++ b/community/oscam/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=oscam
 verbase=1.20
 pkgver=1.20_svn20160307
-pkgrel=1
+pkgrel=2
 pkgdesc="An Open Source Conditional Access Module software"
 url="http://www.streamboard.tv/oscam/"
 arch="all"
diff --git a/community/syncthing/APKBUILD b/community/syncthing/APKBUILD
index f78302f..2c7dc7e 100644
--- a/community/syncthing/APKBUILD
+++ b/community/syncthing/APKBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=syncthing
 pkgver=0.13.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Open Source Continuous File Synchronization"
 url="http://syncthing.net/"
 arch="all"
-- 
2.6.6

---

---

From: Przemyslaw Pawelczyk <[email-masked]>
Date: Mon, 6 Jun 2016 02:05:15 +0200

* testing/at: Properly set primary group in .pre-install.
testing/at/at.pre-install

* testing/ejabberd: Fix .pre-install script broken since 9716bc3570be.
testing/ejabberd/ejabberd.pre-install

* testing/rrdbot: Remove bogus comment in .pre-install script.
testing/rrdbot/rrdbot.pre-install

* testing/[various]: Add group and use it as primary in .pre-* scripts.
testing/dbmail/dbmail.pre-install
testing/dspam/dspam.pre-install
testing/opensips/opensips.pre-install
testing/pdns/pdns.pre-install
testing/qpage/qpage.pre-install
testing/rrdbot/rrdbot.pre-install
testing/wt/wt.pre-install
---
 testing/at/APKBUILD       | 2 +-
 testing/dbmail/APKBUILD   | 2 +-
 testing/dspam/APKBUILD    | 2 +-
 testing/ejabberd/APKBUILD | 2 +-
 testing/opensips/APKBUILD | 2 +-
 testing/pdns/APKBUILD     | 2 +-
 testing/qpage/APKBUILD    | 2 +-
 testing/rrdbot/APKBUILD   | 2 +-
 testing/wt/APKBUILD       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/testing/at/APKBUILD b/testing/at/APKBUILD
index a05431b..c61cdab 100644
--- a/testing/at/APKBUILD
+++ b/testing/at/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Alexander Belkov <[email-masked]>
 pkgname=at
 pkgver=3.1.18
-pkgrel=1
+pkgrel=2
 pkgdesc="AT and batch delayed command scheduling utility and daemon"
 url="http://packages.qa.debian.org/a/at.html"
 arch="all"
diff --git a/testing/dbmail/APKBUILD b/testing/dbmail/APKBUILD
index 2bf79c8..e69b23a 100644
--- a/testing/dbmail/APKBUILD
+++ b/testing/dbmail/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=dbmail
 _realpkgver=3.2.3
 pkgver=3.2.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Fast and scalable sql based mail services"
 url="http://dbmail.org"
 arch="all"
diff --git a/testing/dspam/APKBUILD b/testing/dspam/APKBUILD
index 5edfeeb..7f057fd 100644
--- a/testing/dspam/APKBUILD
+++ b/testing/dspam/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=dspam
 pkgver=3.10.2
 _ver=$pkgver
-pkgrel=4
+pkgrel=5
 pkgdesc="A statistical-algorithmic hybrid anti-spam filter"
 url="http://dspam.nuclearelephant.com/"
 pkgusers="dspam"
diff --git a/testing/ejabberd/APKBUILD b/testing/ejabberd/APKBUILD
index 1051498..0be0794 100644
--- a/testing/ejabberd/APKBUILD
+++ b/testing/ejabberd/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: John Regan <[email-masked]>
 pkgname=ejabberd
 pkgver=16.04
-pkgrel=0
+pkgrel=1
 pkgdesc="An erlang jabber server"
 url="http://www.ejabberd.im"
 arch="all"
diff --git a/testing/opensips/APKBUILD b/testing/opensips/APKBUILD
index 4b17cc8..0fbdda0 100644
--- a/testing/opensips/APKBUILD
+++ b/testing/opensips/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=opensips
 pkgver=1.6.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Flexible and customizable sip routing engine"
 url="http://www.opensips.org/"
 arch="all"
diff --git a/testing/pdns/APKBUILD b/testing/pdns/APKBUILD
index 1336c46..9e71023 100644
--- a/testing/pdns/APKBUILD
+++ b/testing/pdns/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer:  Matt Smith <[email-masked]>
 pkgname=pdns
 pkgver=3.4.8
-pkgrel=1
+pkgrel=2
 pkgdesc="PowerDNS Authoritative Server"
 url="http://www.powerdns.com/"
 arch="all"
diff --git a/testing/qpage/APKBUILD b/testing/qpage/APKBUILD
index 2f1eb5b..96e0b12 100644
--- a/testing/qpage/APKBUILD
+++ b/testing/qpage/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <[email-masked]>
 pkgname=qpage
 pkgver=3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Sends messages to an alphanumeric pager via TAP protocol."
 url="http://www.qpage.org/"
 arch="all"
diff --git a/testing/rrdbot/APKBUILD b/testing/rrdbot/APKBUILD
index 7050d44..2da147f 100644
--- a/testing/rrdbot/APKBUILD
+++ b/testing/rrdbot/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=rrdbot
 pkgver=0.9.7
-pkgrel=1
+pkgrel=2
 pkgdesc="An SNMP polling daemon which writes the polled values to an RRD database"
 url="http://thewalter.net/stef/software/rrdbot/"
 arch="all"
diff --git a/testing/wt/APKBUILD b/testing/wt/APKBUILD
index f93459f..8da3886 100644
--- a/testing/wt/APKBUILD
+++ b/testing/wt/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=wt
 pkgver=3.3.4
 _pkgver=3.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A C++ library and application server for developing and deploying web applications"
 url="http://www.webtoolkit.eu"
 arch="x86 x86_64"
-- 
2.6.6

---