diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2015-10-25 14:08:26 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-27 12:05:49 +0000 |
| commit | c09f81fad04455623848d3c9b394e1800be875a4 (patch) | |
| tree | 12b081c8aec318c62df3d4c7747176e942ead037 | |
| parent | 499a414e25dc9b1e4997974b113827e885eaf7b0 (diff) | |
| download | aports-c09f81fad04455623848d3c9b394e1800be875a4.tar.bz2 aports-c09f81fad04455623848d3c9b394e1800be875a4.tar.xz | |
main/alpine-baselayout: don't create apache and www-data user and group
Those are already created by the main/apache2 package and this should be
the only package which needs those. See also: The last commit to this
package.
| -rw-r--r-- | main/alpine-baselayout/APKBUILD | 14 | ||||
| -rw-r--r-- | main/alpine-baselayout/group | 2 | ||||
| -rw-r--r-- | main/alpine-baselayout/passwd | 1 |
3 files changed, 7 insertions, 10 deletions
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD index b8bd382cad..4018599660 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=3 +pkgrel=4 pkgdesc="Alpine base dir structure and init scripts" url="http://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout" arch="all" @@ -175,9 +175,9 @@ d7da26e76752b2e31c66b63f40a73397 color_prompt 0ea6be55b18804f166e6939e9d5f4099 blacklist.conf f9e3eac60200d41dd5569eeabb4eddff i386.conf 17ba4f49c51dd2ba49ccceb0ecadaca4 kms.conf -b7705151b0a4fad206e8c3c7c384d3a8 group +2346d93610a4cf2c9853715a034ed6bf group d93ca19f6867a1a3918fa782d9b7c512 inittab -ddc08fdf06014ced3347697d19ddf322 passwd +ad29aa5d77ed7855bb8ca2c2f8d8a612 passwd 2939a40b911cac04c85263072c663973 profile 394f8cd9fbf549f1d1b9a5bba680fc92 protocols 5278bea4f45f4e289f72897b84dcb909 services" @@ -188,9 +188,9 @@ a00b56dbd437d3f2c32ced50974daa3cfc84a8dd1cbaf75cf307be20b398fc75 color_prompt 70becab743ff2071247bd144499eadbb1b42a5436dcc63991d69aa63ee2fe755 blacklist.conf 6c46c4cbfb8b7594f19eb94801a350fa2221ae9ac5239a8819d15555caa76ae8 i386.conf 079f74b93a4df310f55f60fea5e05996d3267c50076ae16402fa9e497ea5fdb2 kms.conf -666f79a116c892db4c2e542624178eff5875294f5d5bed35ee912ca24dde2b32 group +6c7ccc945029e0eace9d02a866246aa9fd33151b304fa6b77c9eef8256e7ef3d group 8a54b20451ba9469b5260f76faa90fbde96915bf33e7f03f88bdbaf813400485 inittab -d9f161676f8369feb70e67f69da1548a323ca80fc7317b72073746b5b09b4ec9 passwd +87f5b98022ec18902f935631c620f5c11787f546e60efb8cf795dc00ec65801d passwd 8ef550a4efc4bed1630b47c48aefbf1c63ae6e8d9c1246be92135465965712d2 profile a6695dbd53b87c7b41dfdafd40b1c8ba34fed2f0fa8eaaa296ad17c0b154603e protocols e96af627f7774e8c87b0de843556a355fea6150c4d64fa4e2ff2c5fd610e7a79 services" @@ -201,9 +201,9 @@ sha512sums="94a75cbd309e7b7d3b1bbbddb6f361335336d804c2a331b9963de7cee38633217bcd 2b8e55339955c9670b5b9832bf57e711aca70cd2ebf815a9623fbb7fcd440cca4dd6a4862750885f779080d5c5416de197ff9a250cf116b1c8cf130fafbdaae8 blacklist.conf 49109d434b577563849c43dd8141961ca798dada74d4d3f49003dac1911f522c43438b8241fa254e4faacdd90058f4d39a7d69b1f493f6d57422c1f706547c95 i386.conf b407351a5a64b00100753a13a91f4b1cb51017ae918a91fd37f3a6e76e3b6f562be643e74f969a888bdd54b0ad2d09e3b283d44ae4b5efccca7d7e9f735c5afb kms.conf -47fdcd96226388645bca0bb7dbcf7d1425a8cee6c0e9f699d9c49e6b816ba1bc7c3232015c2140b60d4a70a5735d59cbc05a168def71159b9218c9a3a39fe6e5 group +67d3c5ae38b553a875c57c2df66d459fdf2752e1aa05d6932e8ebc785c1c54824bf0e405e990a901850c08d525812c804b1e10e84716db8ccb317bf84eac5124 group bdb6fe1f3e07466d9badf9a18b1f3fc9585f0a4cb69c00f1fa6d8b1e9903a3c497edefbfd345e324961013999e5692d2ed68ae7defaf1c6e57cc7916f206fd75 inittab -6a6de8721a1951f26391178f18cda9bf47ba4bdec0a7b216657a820f0e52cd04e8d3988e91382f886a824ae4839c9aadcfc2cf4dc5170923c60f0b1b5cce970c passwd +581224c25563c0858a9b41fb9d5144df4a25a655007785a63349421c931769566aac1e8f480f189787d2595366fa1f504e673bbb3afdc62e8f818c215bb487ff passwd c4088a7148c0f161809852d248d2c2272d9c72be3f968c2e2ba40806f508238496eda0f8f2a42aa092773a56800b1dae9f843a42d93f1bb16ba5f58c111d531b profile f1548a2b5a107479446f15905f0f2fbf8762815b2215188d49d905c803786d35de6d98005dc0828fb2486b04aaa356f1216a964befddf1e72cb169656e23b6ac protocols cecfc06b1f455d65b0c54a5651e601298b455771333e39d0109eeffd7ebd8d81b7738738eb647e6d3076230b6f3707782b83662ea3764ec33dc5e0b3453d3965 services" diff --git a/main/alpine-baselayout/group b/main/alpine-baselayout/group index aa4ac6b562..d2c5285575 100644 --- a/main/alpine-baselayout/group +++ b/main/alpine-baselayout/group @@ -36,8 +36,6 @@ shadow:x:42: mysql:x:60: postgres:x:70: cdrw:x:80: -apache:x:81: -www-data:x:82: nut:x:84: usb:x:85: avahi:x:86: diff --git a/main/alpine-baselayout/passwd b/main/alpine-baselayout/passwd index dfe5d79a55..2bbfefb1cf 100644 --- a/main/alpine-baselayout/passwd +++ b/main/alpine-baselayout/passwd @@ -23,7 +23,6 @@ games:x:35:35:games:/usr/games:/sbin/nologin named:x:40:40:bind:/var/bind:/sbin/nologin mysql:x:60:60:mysql:/var/lib/mysql:/sbin/nologin postgres:x:70:70::/var/lib/postgresql:/bin/sh -apache:x:81:81:apache:/var/www:/sbin/nologin nut:x:84:84:nut:/var/state/nut:/sbin/nologin cyrus:x:85:12::/usr/cyrus:/sbin/nologin vpopmail:x:89:89::/var/vpopmail:/sbin/nologin |