tizen 2.3 releasetizen_2.3_releasesubmit/tizen_2.3/20150202.105435tizen_2.3

6 files changed, 8 insertions, 145 deletions

diff --git a/group b/group
index 8cecdfc..6fcca83 100644
--- a/group
+++ b/group
@@ -12,7 +12,7 @@ uucp:*:10:
 man:*:12:
 proxy:*:13:
 kmem:*:15:
-dialout:*:20:app
+dialout:*:20:app,pulse
 fax:*:21:
 voice:*:22:
 cdrom:*:24:
@@ -132,7 +132,7 @@ crash:x:6828:app,system,media,developer,pulse
 system:x:1000:
 bluetooth:x:1002:
 graphics:x:1003:
-input:x:1004:developer
+input:x:1004:developer,app
 log:x:1007:
 compass:x:1008:
 mount:x:1009:
@@ -154,3 +154,4 @@ net_raw:x:3004:
 net_admin:x:3005:
 misc:x:9998:
 systemd-journal:x:190:
+libvirt:x:191:
diff --git a/packaging/0001-Prevent-marking-shadow-at-passwd-group.patch b/packaging/0001-Prevent-marking-shadow-at-passwd-group.patch
deleted file mode 100644
index 8416f03..0000000
--- a/packaging/0001-Prevent-marking-shadow-at-passwd-group.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 069db1ebb786d75813112d08e9979940a799f7ca Mon Sep 17 00:00:00 2001
-From: "walyong.cho" <walyong.cho@samsung.com>
-Date: Thu, 17 Jan 2013 12:09:37 +0900
-Subject: [PATCH] Prevent marking shadow at passwd, group.
-
-Change-Id: Ife51362b8e38fe5bedfef545a90bfc112177d29e
----
- shadowconvert.sh |    3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/shadowconvert.sh b/shadowconvert.sh
-index 4be13b6..006046d 100755
---- a/shadowconvert.sh
-+++ b/shadowconvert.sh
-@@ -11,8 +11,5 @@ sed -e "s/:.*/:*:`expr $(date +%s) / 86400`:0:99999:7:::/" passwd >shadow
- #make prototype for /etc/gshadow
- sed -e 's/:[0-9]\+:/::/g' group >gshadow
- 
--#mark passwd and group files entries shadowed
--sed -i -e 's/^\([^:]\+\):[^:]*:/\1:x:/' passwd group
--
- echo Converted successfully.
- exit 0
--- 
-1.7.9.5
-
diff --git a/packaging/setup.changes b/packaging/setup.changes
deleted file mode 100644
index f8d20c2..0000000
--- a/packaging/setup.changes
+++ /dev/null
@@ -1,84 +0,0 @@
-* Wed Jun 01 2011 Marko Saukko <marko.saukko@cybercom.com> - 2.8.15
-- Add ttyO2 to setup-2.8.9-securetty.patch (used in N900 for example)
-
-* Sat May 21 2011 Anas Nashif <anas.nashif@intel.com> - 2.8.15
-- Remove dependency on perl and tcsh
-
-* Wed Aug 18 2010 Jan-Simon Moeller <jsmoeller@linuxfoundation.org> - 2.8.15
-- Don't include cflags in this way into the build environment. Never ever!
-- Preparing split of this into a file included in /etc/profile.d/ only on target
-  and keep it in sync with prjconf. prjconf is master!
-- Better pull from prjconf and embed !
-
-* Wed Aug 18 2010 Austin Zhang <austin.zhang@linux.intel.com> - 2.8.15
-- Don't omit frame pointer in building.
-
-* Mon Jul 19 2010 Marko Saukko <marko.saukko@cybercom.com> - 2.8.15
-- Added ttyS2 to securetty.
-
-* Thu Jul 08 2010 Austin Zhang <austin.zhang@linux.intel.com> - 2.8.15
-- Added additional flags for relocation and RO PLT
-
-* Fri Mar 05 2010 Austin Zhang <austin.zhang@linux.intel.com> - 2.8.15
-- Remove loop optimization compiler options, which will lead to 
-  some unexpected compiling failure.
-
-* Wed Feb 10 2010 Austin Zhang <austin.zhang@linux.intel.com> - 2.8.15
-- Rename version to 2.8.15 (source had been updated, but changelog not)
-  and remove obsoleted stuffs
-- Correct cmov_fast to fast_cmov
-- Add new compiler optimization flags
-
-* Sun Feb 7 2010 Arjan van de Ven <arjan@linux.intel.com> - 2.8.9
-- some older configure scripts don't understand "atom" and as a result
-  don't think the CPU supports CMOV. Help these configure scripts by
-  setting the appropriate environment variable.
-
-* Tue Nov 24 2009 Arjan van de Ven <arjan@linux.intel.com> - 2.8.9
-- use -mtune=atom for the CFLAGS env var
-
-* Mon Oct 05 2009 Anas Nashif <anas.nashif@intel.com> - 2.8.9
-- Assign polkit user to polkit package
-
-* Tue Sep 15 2009 Anas Nashif <anas.nashif@intel.com> - 2.8.9
-- Rebase to 2.8.9
-
-* Thu Apr 30 2009 Arjan van de Ven <arjan@linux.intel.com> 2.6.14
-- reinstate the CFLAGS environment variable
-
-* Tue Apr 28 2009 Anas Nashif <anas.nashif@intel.com> 2.6.14
-- Do not set CFLAGS in profile
-
-* Wed Apr 01 2009 Arjan van de Ven <arjan@linux.intel.com> 2.6.14
-- set the CFLAGS environment variable
-
-* Sat Feb 28 2009 Peter Zhu <peter.j.zhu@intel.com> 2.6.14
-- add ttyS0 into securetty
-
-* Mon Feb 09 2009 Vivian Zhang <vivian.zhang@intel.com> 2.6.14
-- Set i18n stuff in /etc/profile
-
-* Wed Jan 14 2009 Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> 2.6.14
-- Fix misformatted entry for audio group (add empty password field)
-
-* Tue Jan 13 2009 Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> 2.6.14
-- Add an audio group as an stop gap sollution until policy kit is fixed
-
-* Fri Jan 09 2009 Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> 2.6.14
-- Add missing patch to add groups needed by udev
-
-* Thu Jan 08 2009 Anas Nashif <anas.nashif@intel.com> 2.6.14
-- Disable missing patch for now
-
-* Fri Dec 19 2008 Arjan van de Ven <arjan@linux.intel.com> 2.6.14
-- Enable coredumps by default
-
-* Tue Dec 16 2008 Anas Nashif <anas.nashif@intel.com> 2.6.14
-- Fixed rpmlint errors in Summary tag
-
-* Thu Dec 11 2008 Anas Nashif <anas.nashif@intel.com> 2.6.14
-- Remove dependency on tcsh
-
-* Fri Dec  5 2008 Auke Kok <auke-jan.h.kok@intel.com>
-- add vcsa and floppy user/group ids
-
diff --git a/packaging/setup.spec b/packaging/setup.spec
index 0a3703a..b3b99b1 100644
--- a/packaging/setup.spec
+++ b/packaging/setup.spec
@@ -6,7 +6,6 @@ License: Public Domain
 Group: System/Base
 URL: https://fedorahosted.org/setup/
 Source0: https://fedorahosted.org/releases/s/e/%{name}/%{name}-0.1.tar.bz2
-Patch101: 0001-Prevent-marking-shadow-at-passwd-group.patch
 BuildArch: noarch
 BuildRequires: bash
 Requires: filesystem
@@ -17,7 +16,6 @@ setup files, such as passwd, group, and profile.
 
 %prep
 %setup -q 
-%patch101 -p1
 ./shadowconvert.sh
 
 %build
@@ -50,18 +48,8 @@ rm -f %{buildroot}/etc/setup.spec
 rm -rf %{buildroot}/etc/packaging
 
 mkdir -p %{buildroot}/opt/etc
-#mv %{buildroot}/etc/{passwd,group,shadow,gshadow} %{buildroot}/opt/etc
-%if "%{_repository}" == "wearable"
-mv %{buildroot}/etc/{passwd,group} %{buildroot}/opt/etc
-%endif
 pushd %{buildroot}/etc
-rm -f passwd shadow group gshadow
-%if "%{_repository}" == "wearable"
-ln -s ../opt/etc/passwd
-#ln -s ../opt/etc/shadow
-ln -s ../opt/etc/group
-#ln -s ../opt/etc/gshadow
-%endif
+rm -f shadow gshadow
 popd
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/license
 cat COPYING > $RPM_BUILD_ROOT%{_datadir}/license/setup
@@ -79,25 +67,11 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_datadir}/license/setup
-%if "%{_repository}" == "wearable"
-/etc/passwd
-/etc/group
-%endif
+%verify(not md5 size mtime) %config(noreplace) /etc/passwd
+%verify(not md5 size mtime) %config(noreplace) /etc/group
 #/etc/shadow
 #/etc/gshadow
-%if "%{_repository}" == "wearable"
-%config(noreplace) /opt/etc/passwd
-%config(noreplace) /opt/etc/group
-%endif
-#%config(noreplace,missingok) /opt/etc/shadow
-#%config(noreplace,missingok) /opt/etc/gshadow
 
-%if "%{_repository}" == "wearable"
-%verify(not md5 size mtime) %config(noreplace) /opt/etc/passwd
-%verify(not md5 size mtime) %config(noreplace) /opt/etc/group
-%endif
-#%verify(not md5 size mtime) %attr(0000,root,root) %config(noreplace,missingok) /opt/etc/shadow
-#%verify(not md5 size mtime) %attr(0000,root,root) %config(noreplace,missingok) /opt/etc/gshadow
 %verify(not md5 size mtime) %config(noreplace) /etc/services
 %verify(not md5 size mtime) %config(noreplace) /etc/exports
 %config(noreplace) /etc/aliases
diff --git a/passwd b/passwd
index 0b8b262..d366d84 100644
--- a/passwd
+++ b/passwd
@@ -31,4 +31,5 @@ developer::5100:5100:developer with SDK:/home/developer:/bin/false
 pulse:x:6507:6507:PulseAudio daemon:/var/run/pulse:/bin/false
 misc:x:9998:9998:misc:/home/misc:/bin/false
 sshd:x:112:65534::/var/run/sshd:/usr/sbin/nologin
-
+security-containers:x:377:65534:security-containers:/var/lib/empty:/sbin/false
+nobody:x:65534:65534:nobody:/nonexistent:/usr/sbin/nologin
diff --git a/shadowconvert.sh b/shadowconvert.sh
index 4be13b6..006046d 100755
--- a/shadowconvert.sh
+++ b/shadowconvert.sh
@@ -11,8 +11,5 @@ sed -e "s/:.*/:*:`expr $(date +%s) / 86400`:0:99999:7:::/" passwd >shadow
 #make prototype for /etc/gshadow
 sed -e 's/:[0-9]\+:/::/g' group >gshadow
 
-#mark passwd and group files entries shadowed
-sed -i -e 's/^\([^:]\+\):[^:]*:/\1:x:/' passwd group
-
 echo Converted successfully.
 exit 0