~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
4 4

[alpine-aports] [PATCH 1/2] main/distcc: create distcc user in .pre-install script

Details
Message ID
<1448052205-8377-1-git-send-email-soeren+git@soeren-tempel.net>
Sender timestamp
1448052204
DKIM signature
missing
Download raw message
Patch: +9 -2
---
 main/distcc/APKBUILD           | 6 ++++--
 main/distcc/distcc.pre-install | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 main/distcc/distcc.pre-install

diff --git a/main/distcc/APKBUILD b/main/distcc/APKBUILD
index ea0198f..a685904 100644
--- a/main/distcc/APKBUILD
+++ b/main/distcc/APKBUILD
@@ -1,13 +1,15 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=distcc
pkgver=3.1
pkgrel=9
pkgrel=10
pkgdesc="A distributed C, C++, Obj C compiler"
url="http://distcc.org"
arch="all"
license="GPL2"
depends=
depends=""
makedepends="popt-dev python-dev"
install="$pkgname.pre-install"
source="http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2
	distcc-3.1-clone.patch
	distcc-hardened.patch
diff --git a/main/distcc/distcc.pre-install b/main/distcc/distcc.pre-install
new file mode 100644
index 0000000..bd7fba2
--- /dev/null
+++ b/main/distcc/distcc.pre-install
@@ -0,0 +1,5 @@
#!/bin/sh

addgroup -S distcc 2>/dev/null
adduser -H -h /dev/null -s /sbin/nologin -G distcc -D distcc 2>/dev/null
exit 0
-- 
2.6.3



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 2/2] main/alpine-baselayout: remove distcc user

Details
Message ID
<1448052205-8377-2-git-send-email-soeren+git@soeren-tempel.net>
In-Reply-To
<1448052205-8377-1-git-send-email-soeren+git@soeren-tempel.net> (view parent)
Sender timestamp
1448052205
DKIM signature
missing
Download raw message
Patch: +1 -3
Instead create it in the .pre-install script in the main/distcc package.
See the last commit for details.
---
 main/alpine-baselayout/APKBUILD | 2 +-
 main/alpine-baselayout/group    | 1 -
 main/alpine-baselayout/passwd   | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index 2348234..3af7094 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-baselayout
pkgver=2.3.2
pkgrel=7
pkgrel=8
pkgdesc="Alpine base dir structure and init scripts"
url="http://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
arch="all"
diff --git a/main/alpine-baselayout/group b/main/alpine-baselayout/group
index 9eccb74..3fe3509 100644
--- a/main/alpine-baselayout/group
+++ b/main/alpine-baselayout/group
@@ -41,7 +41,6 @@ users:x:100:games
ntp:x:123:
nofiles:x:200:
smmsp:x:209:smmsp
distcc:x:240:
locate:x:245:
abuild:x:300:
utmp:x:406:
diff --git a/main/alpine-baselayout/passwd b/main/alpine-baselayout/passwd
index 9165db6..f80ff2b 100644
--- a/main/alpine-baselayout/passwd
+++ b/main/alpine-baselayout/passwd
@@ -25,6 +25,5 @@ cyrus:x:85:12::/usr/cyrus:/sbin/nologin
vpopmail:x:89:89::/var/vpopmail:/sbin/nologin
ntp:x:123:123:NTP:/var/empty:/sbin/nologin
smmsp:x:209:209:smmsp:/var/spool/mqueue:/sbin/nologin
distcc:x:240:2:distccd:/dev/null:/sbin/nologin
guest:x:405:100:guest:/dev/null:/sbin/nologin
nobody:x:65534:65534:nobody:/:/sbin/nologin
-- 
2.6.3



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

Re: [alpine-aports] [PATCH 2/2] main/alpine-baselayout: remove distcc user

Isaac Dunham <ibid.ag@gmail.com>
Details
Message ID
<20151124190126.GA11700@newbook>
In-Reply-To
<20151124104941.GA19509@francium.wlan.uni-bremen.de> (view parent)
Sender timestamp
1448391687
DKIM signature
missing
Download raw message
On Tue, Nov 24, 2015 at 11:49:41AM +0100, Sören Tempel wrote:
> On 24.11.15, Natanael Copa wrote:
> > >>> ERROR: alpine-baselayout: all failed
> > >>> alpine-baselayout: Uninstalling dependencies...
> > 
> > It would be nice if you test built before sending.
> 
> I do, the problem that happens every now and then ist that I forget to
> commit all changes before sending the thing…sorry :(

My solution to that family of problems was a script that would
-update the checksums
-source the APKBUILD
-check whether the commit is a new package, update, or fix
 (based on whether APKBUILD existed / $pkgver was updated)
-git add APKBUILD and any necessary source files
-figure out what package is being updated
-run git commit -m "$PACKAGE: $COMMITTYPE" --edit .

This meant that I get roughly the proper commit message,
along with a chance to edit it, and all the changed source files are
updated.

HTH,
Isaac Dunham

Re: [alpine-aports] [PATCH 2/2] main/alpine-baselayout: remove distcc user

Natanael Copa <ncopa@alpinelinux.org>
Details
Message ID
<20151124113718.5724d15e@ncopa-desktop.alpinelinux.org>
In-Reply-To
<1448052205-8377-2-git-send-email-soeren+git@soeren-tempel.net> (view parent)
Sender timestamp
1448361438
DKIM signature
missing
Download raw message
On Fri, 20 Nov 2015 21:43:25 +0100
Sören Tempel <soeren+git@soeren-tempel.net> wrote:

> Instead create it in the .pre-install script in the main/distcc package.
> See the last commit for details.

>>> alpine-baselayout: Cleaning temporary build dirs...
>>> alpine-baselayout: Checking sha512sums...
mkmntdirs.c: OK
crontab: OK
color_prompt: OK
aliases.conf: OK
blacklist.conf: OK
i386.conf: OK
kms.conf: OK
group: FAILED
sha512sum: WARNING: 1 of 1 computed checksums did NOT match
inittab: OK
passwd: FAILED
sha512sum: WARNING: 1 of 1 computed checksums did NOT match
profile: OK
protocols: OK
services: OK
>>> ERROR: alpine-baselayout: all failed
>>> alpine-baselayout: Uninstalling dependencies...

It would be nice if you test built before sending.

-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

Re: [alpine-aports] [PATCH 2/2] main/alpine-baselayout: remove distcc user

Sören Tempel <tempel@uni-bremen.de>
Details
Message ID
<20151124104941.GA19509@francium.wlan.uni-bremen.de>
In-Reply-To
<20151124113718.5724d15e@ncopa-desktop.alpinelinux.org> (view parent)
Sender timestamp
1448362181
DKIM signature
missing
Download raw message
On 24.11.15, Natanael Copa wrote:
> >>> ERROR: alpine-baselayout: all failed
> >>> alpine-baselayout: Uninstalling dependencies...
> 
> It would be nice if you test built before sending.

I do, the problem that happens every now and then ist that I forget to
commit all changes before sending the thing…sorry :(

Sören.


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)