tagging 0.0.35

git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/tags/0.0.35@2535 ec354946-7b23-47d6-9f5a-488ba84defc7

Makefile

@@ -35,6 +35,8 @@ install:
 	install -d ${DESTDIR}/usr/share/vbootstrap/{scripts,sources.list.d}
 	install -d ${DESTDIR}/usr/sbin
 	install -d ${DESTDIR}/etc/vbootstrap
+	install -d ${DESTDIR}/etc/security/console.apps
+	install -d ${DESTDIR}/etc/pam.d
 	install -d ${DESTDIR}/etc/bash_completion.d
 	for sh in vbootstrap/scripts/*.sh; do \
 	  inst_sh=`basename $$sh .sh`; \
@@ -44,6 +46,8 @@ install:
 	install -m 755 vbootstrap.sh ${DESTDIR}/usr/sbin/vbootstrap
 	install -m 755 vbuilder.sh ${DESTDIR}/usr/sbin/vbuilder
 	install -m 644 vbuilder.conf ${DESTDIR}/etc/vbootstrap/vbuilder.conf
+	install -m 644 vbuilder.console ${DESTDIR}/etc/security/console.apps/vbuilder
+	install -m 644 vbuilder.pamd ${DESTDIR}/etc/pam.d/vbuilder
 	install -m 644 vbuilder-bash-completion.sh ${DESTDIR}/etc/bash_completion.d/vbuilder
 
 	cd po && make install DESTDIR=${DESTDIR}

po/ja.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.35\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-18 11:55+0900\n"
+"POT-Creation-Date: 2011-01-19 03:30+0900\n"
 "PO-Revision-Date: 2011-01-18 18:06+0900\n"
 "Last-Translator: Munehiro Yamamoto <munepi@vinelinux.org>\n"
 "Language-Team: Vine Linux <Vine@vinelinux.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. #
@@ -38,28 +38,28 @@ msgstr "ベースシステムをインストールしています。"
 msgid "vboostrap done."
 msgstr "vbootstrap が完了しました。"
 
-#: vbuilder.sh.in:64 vbuilder.sh.in:71
+#: vbuilder.sh.in:66 vbuilder.sh.in:73
 msgid "E: You can give no more options after actions"
 msgstr "E: 動作の以後にオプションを与えられません"
 
-#: vbuilder.sh.in:83 vbuilder.sh.in:97 vbuilder.sh.in:100
+#: vbuilder.sh.in:85 vbuilder.sh.in:99 vbuilder.sh.in:102
 msgid "E: Missing some parameters after $1"
 msgstr "E: $1 以後のいくつかの引数に間違いがあります"
 
-#: vbuilder.sh.in:91
+#: vbuilder.sh.in:93
 msgid "E: You must give at least one action"
 msgstr "E: 少なくとも1つの動作を与えなければなりません"
 
-#: vbuilder.sh.in:163 vbuilder.sh.in:167
+#: vbuilder.sh.in:165 vbuilder.sh.in:169
 msgid "E: arch ${VARCH} is NOT supported on $(uname -i)"
 msgstr "E: ${VARCH} アーキテクチャは $(uname -i) 上で非サポートです"
 
-#: vbuilder.sh.in:174 vbuilder.sh.in:185
+#: vbuilder.sh.in:176 vbuilder.sh.in:187
 #, sh-format
 msgid "E: ${VERSION} is NOT supported"
 msgstr "E: バージョン ${VERSION} は非サポートです"
 
-#: vbuilder.sh.in:192
+#: vbuilder.sh.in:194
 #, sh-format
 msgid "E: version ${VERSION} does not support --dist-upgrade option"
 msgstr ""
@@ -69,76 +69,72 @@ msgstr ""
 #. # "test" category only exists in VineSeed
 #. #!! "proposed-updates" category does not exist in 4.2
 #. # "security" category does not exist in VineSeed
-#: vbuilder.sh.in:217 vbuilder.sh.in:223 vbuilder.sh.in:230 vbuilder.sh.in:234
+#: vbuilder.sh.in:219 vbuilder.sh.in:225 vbuilder.sh.in:232 vbuilder.sh.in:236
 #, sh-format
 msgid "E: No such category exists: $cat"
 msgstr "E: そのようなカテゴリは存在しません: $cat"
 
-#: vbuilder.sh.in:243
+#: vbuilder.sh.in:245
 #, sh-format
 msgid "E: rpm build target ${TARGET} is NOT supported"
 msgstr "E: rpm ビルドターゲット ${TARGET} はサポートされていません"
 
-#: vbuilder.sh.in:296
+#: vbuilder.sh.in:298
 msgid "apt-get update on host ... "
 msgstr "ホスト上で apt-get update を実行しています ... "
 
-#: vbuilder.sh.in:298 vbuilder.sh.in:303 vbuilder.sh.in:357 vbuilder.sh.in:484
-#: vbuilder.sh.in:490 vbuilder.sh.in:685
+#: vbuilder.sh.in:300 vbuilder.sh.in:305 vbuilder.sh.in:359 vbuilder.sh.in:478
+#: vbuilder.sh.in:484 vbuilder.sh.in:679
 msgid "done."
 msgstr "完了"
 
-#: vbuilder.sh.in:301
+#: vbuilder.sh.in:303
 msgid "apt-get update on chroot ... "
 msgstr "chroot 上で apt-get update を実行しています ... "
 
-#: vbuilder.sh.in:355
+#: vbuilder.sh.in:357
 msgid "Retry lazy unmount ... "
 msgstr "lazy アンマウントを再度試しています ... "
 
-#: vbuilder.sh.in:458
-msgid "The root privilege is required."
-msgstr "root 権限が要求されます"
-
-#: vbuilder.sh.in:482
+#: vbuilder.sh.in:476
 #, sh-format
 msgid "Cleaning build root ${UNIONFS_DIR} via unionfs ... "
 msgstr "unionfs 経由でビルドルート ${UNIONFS_DIR} をクリーニング中 ... "
 
-#: vbuilder.sh.in:488
+#: vbuilder.sh.in:482
 #, sh-format
 msgid "Cleaning build root ${BUILD_ROOT} ... "
 msgstr "ビルドルート ${BUILD_ROOT} をクリーニング中 ... "
 
-#: vbuilder.sh.in:494
+#: vbuilder.sh.in:488
 #, sh-format
 msgid "Cleanup a build farm for ${VERSION} done."
 msgstr "${VERSION} のビルドファームをクリーンアップしました。"
 
-#: vbuilder.sh.in:583
+#: vbuilder.sh.in:577
 #, sh-format
 msgid "Making a build farm for ${VERSION} done."
 msgstr "${VERSION} のビルドファームを構築しました。"
 
-#: vbuilder.sh.in:603
+#: vbuilder.sh.in:597
 #, sh-format
 msgid "E: $RPM_PKG is not a package name"
 msgstr "E: $RPM_PKG はパッケージ名でありません"
 
-#: vbuilder.sh.in:643
+#: vbuilder.sh.in:637
 #, sh-format
 msgid "E: $RPM_PKG is not a source RPM package"
 msgstr "E: $RPM_PKG はソース RPM パッケージでありません"
 
 #. # copy built rpms to ${HOME}/rpm/ for each archtectures
-#: vbuilder.sh.in:666
+#: vbuilder.sh.in:660
 #, sh-format
 msgid "Copying built rpms to ${BUILT_RPMS_DIR} for each archtectures ... "
 msgstr ""
 "各アーキテクチャに対して、ビルドされた rpm ファイルを ${BUILT_RPMS_DIR} にコ"
 "ピーしています ... "
 
-#: vbuilder.sh.in:693
+#: vbuilder.sh.in:687
 #, sh-format
 msgid "W: \\$SUDO_USER is empty"
 msgstr "W: \\$SUDO_USER が空です"
@@ -148,7 +144,8 @@ msgstr "W: \\$SUDO_USER が空です"
 #: vbootstrap/scripts/VineSeed.sh:9 vbootstrap/scripts/VineSeed_i386.sh:9
 #, sh-format
 msgid "running vbootstrap post install scripts for $INSTVER on $INSTDIR"
-msgstr "$INSTDIR において $INSTVER に対する vbootstrap の後処理を実行しています。"
+msgstr ""
+"$INSTDIR において $INSTVER に対する vbootstrap の後処理を実行しています。"
 
 #: vbootstrap/scripts/4.2.sh:12 vbootstrap/scripts/4.2_i386.sh:12
 #: vbootstrap/scripts/5.2.sh:12 vbootstrap/scripts/5.2_i386.sh:12
@@ -180,3 +177,6 @@ msgstr " apt データベースを更新しています ... "
 #: vbootstrap/scripts/VineSeed.sh:18 vbootstrap/scripts/VineSeed_i386.sh:18
 msgid " rebuilding rpm database with chroot rpm... "
 msgstr " chroot 上の rpm で RPM データベースを再構築しています ... "
+
+#~ msgid "The root privilege is required."
+#~ msgstr "root 権限が要求されます"

po/vbootstrap.pot

@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-18 11:55+0900\n"
+"POT-Creation-Date: 2011-01-19 03:30+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,28 +38,28 @@ msgstr ""
 msgid "vboostrap done."
 msgstr ""
 
-#: vbuilder.sh.in:64 vbuilder.sh.in:71
+#: vbuilder.sh.in:66 vbuilder.sh.in:73
 msgid "E: You can give no more options after actions"
 msgstr ""
 
-#: vbuilder.sh.in:83 vbuilder.sh.in:97 vbuilder.sh.in:100
+#: vbuilder.sh.in:85 vbuilder.sh.in:99 vbuilder.sh.in:102
 msgid "E: Missing some parameters after $1"
 msgstr ""
 
-#: vbuilder.sh.in:91
+#: vbuilder.sh.in:93
 msgid "E: You must give at least one action"
 msgstr ""
 
-#: vbuilder.sh.in:163 vbuilder.sh.in:167
+#: vbuilder.sh.in:165 vbuilder.sh.in:169
 msgid "E: arch ${VARCH} is NOT supported on $(uname -i)"
 msgstr ""
 
-#: vbuilder.sh.in:174 vbuilder.sh.in:185
+#: vbuilder.sh.in:176 vbuilder.sh.in:187
 #, sh-format
 msgid "E: ${VERSION} is NOT supported"
 msgstr ""
 
-#: vbuilder.sh.in:192
+#: vbuilder.sh.in:194
 #, sh-format
 msgid "E: version ${VERSION} does not support --dist-upgrade option"
 msgstr ""
@@ -66,74 +67,70 @@ msgstr ""
 #. # "test" category only exists in VineSeed
 #. #!! "proposed-updates" category does not exist in 4.2
 #. # "security" category does not exist in VineSeed
-#: vbuilder.sh.in:217 vbuilder.sh.in:223 vbuilder.sh.in:230 vbuilder.sh.in:234
+#: vbuilder.sh.in:219 vbuilder.sh.in:225 vbuilder.sh.in:232 vbuilder.sh.in:236
 #, sh-format
 msgid "E: No such category exists: $cat"
 msgstr ""
 
-#: vbuilder.sh.in:243
+#: vbuilder.sh.in:245
 #, sh-format
 msgid "E: rpm build target ${TARGET} is NOT supported"
 msgstr ""
 
-#: vbuilder.sh.in:296
+#: vbuilder.sh.in:298
 msgid "apt-get update on host ... "
 msgstr ""
 
-#: vbuilder.sh.in:298 vbuilder.sh.in:303 vbuilder.sh.in:357 vbuilder.sh.in:484
-#: vbuilder.sh.in:490 vbuilder.sh.in:685
+#: vbuilder.sh.in:300 vbuilder.sh.in:305 vbuilder.sh.in:359 vbuilder.sh.in:478
+#: vbuilder.sh.in:484 vbuilder.sh.in:679
 msgid "done."
 msgstr ""
 
-#: vbuilder.sh.in:301
+#: vbuilder.sh.in:303
 msgid "apt-get update on chroot ... "
 msgstr ""
 
-#: vbuilder.sh.in:355
+#: vbuilder.sh.in:357
 msgid "Retry lazy unmount ... "
 msgstr ""
 
-#: vbuilder.sh.in:458
-msgid "The root privilege is required."
-msgstr ""
-
-#: vbuilder.sh.in:482
+#: vbuilder.sh.in:476
 #, sh-format
 msgid "Cleaning build root ${UNIONFS_DIR} via unionfs ... "
 msgstr ""
 
-#: vbuilder.sh.in:488
+#: vbuilder.sh.in:482
 #, sh-format
 msgid "Cleaning build root ${BUILD_ROOT} ... "
 msgstr ""
 
-#: vbuilder.sh.in:494
+#: vbuilder.sh.in:488
 #, sh-format
 msgid "Cleanup a build farm for ${VERSION} done."
 msgstr ""
 
-#: vbuilder.sh.in:583
+#: vbuilder.sh.in:577
 #, sh-format
 msgid "Making a build farm for ${VERSION} done."
 msgstr ""
 
-#: vbuilder.sh.in:603
+#: vbuilder.sh.in:597
 #, sh-format
 msgid "E: $RPM_PKG is not a package name"
 msgstr ""
 
-#: vbuilder.sh.in:643
+#: vbuilder.sh.in:637
 #, sh-format
 msgid "E: $RPM_PKG is not a source RPM package"
 msgstr ""
 
 #. # copy built rpms to ${HOME}/rpm/ for each archtectures
-#: vbuilder.sh.in:666
+#: vbuilder.sh.in:660
 #, sh-format
 msgid "Copying built rpms to ${BUILT_RPMS_DIR} for each archtectures ... "
 msgstr ""
 
-#: vbuilder.sh.in:693
+#: vbuilder.sh.in:687
 #, sh-format
 msgid "W: \\$SUDO_USER is empty"
 msgstr ""

vbootstrap-vl.spec

@@ -74,9 +74,18 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 %{_datadir}/vbootstrap/*
 %{_sysconfdir}/bash_completion.d/vbuilder
 %config(noreplace) %{_sysconfdir}/vbootstrap/vbuilder.conf
+%config(noreplace) %{_sysconfdir}/pam.d/vbuilder
+%config(noreplace) %{_sysconfdir}/security/console.apps/vbuilder
 
 
 %changelog
+* Wed Jan 19 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.35-1
+- updated po translations
+- updated vbuilder.sh.in, vbuilder-bash-completion.sh
+  - added --rpmbuild-define, --rpmbuild-without option
+- supported usermode
+  - dropped require-root() from vbuilder.sh.in
+
 * Tue Jan 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.34-1
 - updated vbuilder.sh.in
   - defined require-root() (Thanks to tomo-p-san)

vbuilder-bash-completion.sh

@@ -22,7 +22,7 @@ _vbuilder()
     first="${COMP_WORDS[1]}"
 
     ## The basic options we'll complete.
-    options="--version --arch --category --dist-upgrade --unionfs --target --with-compat32 --rpmbuild-with --sign --no-install --bootstrap-dir --cache-dir --built-rpms-dir"
+    options="--version --arch --category --dist-upgrade --unionfs --target --with-compat32 --rpmbuild-define --rpmbuild-with --rpmbuild-without --sign --no-install --bootstrap-dir --cache-dir --built-rpms-dir"
     actions="clean build build-rpm install-rpm remove-rpm show-info"
     opts="$options $actions"
 

vbuilder.console

@@ -0,0 +1,5 @@
+FALLBACK=false
+PROGRAM=/usr/sbin/vbuilder
+GUI=no
+USER=root
+# UGROUPS=wheel

vbuilder.pamd

@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       sufficient	pam_rootok.so
+auth       include	system-auth
+account    required	pam_permit.so
+session	   required	pam_permit.so

vbuilder.sh.in

@@ -6,7 +6,7 @@ TEXTDOMAINDIR=/usr/share/locale
 
 Usage(){
     cat<<EOF
-Usage:	$(basename $0) {--version [version]} {--arch [arch]} {--category [categories]} {--dist-upgrade} {--target [target]} {--with-compat32} {--rpmbuild-with [bcond_with]} {--sign} {--no-install} {--bootstrap-dir [directory]} {--cache-dir [directory]} {--built-rpms-dir [directory]} {clean|build|build-rpm [src.rpm]|install-rpm [arch.rpm|package]|remove-rpm [package]|show-info}
+Usage:	$(basename $0) {--version [version]} {--arch [arch]} {--category [categories]} {--dist-upgrade} {--target [target]} {--with-compat32} {--rpmbuild-define [macro_expr]} {--rpmbuild-with [bcond_with]} {--rpmbuild-without [bcond_with]} {--sign} {--no-install} {--bootstrap-dir [directory]} {--cache-dir [directory]} {--built-rpms-dir [directory]} {clean|build|build-rpm [src.rpm]|install-rpm [arch.rpm|package]|remove-rpm [package]|show-info}
 
 Options:
 	--version:		set [version] (default: ${DEFAULT_VERSION})
@@ -16,7 +16,9 @@ Options:
 	--unionfs:		cover a bootstrap with unionfs
 	--target:		build rpms with [target]
 	--with-compat32:	build rpms with compat32 on boostrap
+	--rpmbuild-define:	give a option --define [macro_expr] to rpmbuild
 	--rpmbuild-with:	give a option --with [bcond_with] to rpmbuild
+	--rpmbuild-without:	give a option --without [bcond_with] to rpmbuild
 	--sign:			sign built rpms
 	--no-install:		build only a source rpm - do NOT install a built rpm
 	--bootstrap-dir:	set a bootstrap directory (default: ${VBOOTSTRAP_DIR})
@@ -59,7 +61,7 @@ check-parameter(){
 		Usage
 		return 1
 		;;
-	    --version|--arch|--category|--target|--rpmbuild-with|--bootstrap-dir|--cache-dir|--built-rpms-dir)
+	    --version|--arch|--category|--target|--rpmbuild-define|--rpmbuild-with|--rpmbuild-without|--bootstrap-dir|--cache-dir|--built-rpms-dir)
 		[ $with_actions -eq 1 ] && \
 		    echo $"E: You can give no more options after actions" && \
 		    return 1
@@ -453,14 +455,6 @@ EOF
     return 0
 }
 
-require-root(){
-  if [ $USER != "root" ]; then
-    echo $"The root privilege is required."
-    sudo $0 $*
-    return $?
-  fi
-}
-
 ##############################################################################
 
 Clean(){
@@ -654,7 +648,7 @@ RPM_Build(){
 
 
     ## change ${DIST_RELEASE}
-    BASE_RPM_PKG=$(echo $BASE_RPM_PKG | sed -e "s/vl\([0-9]*\)\./vl${DIST_RELEASE}\./")
+    BASE_RPM_PKG=$(echo $BASE_RPM_PKG | sed -e "s/vl[0-9]*\([A-Za-z]*\)\./vl${DIST_RELEASE}\1\./")
 
     ## rebuild $BASE_RPM_PKG on ${DIST_RELEASE}
     $__chroot_sh "cd ${BUILD_DIR}/SRPMS && apt-get -o APT::Install::Virtual=true -y build-dep $BASE_RPM_PKG"
@@ -704,12 +698,10 @@ setup-vbuilder || exit 1
 
 check-parameter $* || exit 1
 
-require-root $* || exit 1
-
 while [ $# -gt 0 ]; do
     tmpARG=$1
     case $tmpARG in
-	--version|--arch|--category|--target|--rpmbuild-with|--bootstrap-dir|--cache-dir|--built-rpms-dir)
+	--version|--arch|--category|--target|--rpmbuild-define|--rpmbuild-with|--rpmbuild-without|--bootstrap-dir|--cache-dir|--built-rpms-dir)
 	    shift
 	    ;;
 	--dist-upgrade|--unionfs|--with-compat32|--sign|--no-install)
@@ -748,9 +740,15 @@ while [ $# -gt 0 ]; do
 	--with-compat32)
 	    RPM_OPTS="${RPM_OPTS} --with compat32"
 	    ;;
+	--rpmbuild-define)
+	    RPM_OPTS="${RPM_OPTS} --define $1"
+	    ;;
 	--rpmbuild-with)
 	    RPM_OPTS="${RPM_OPTS} --with $1"
 	    ;;
+	--rpmbuild-without)
+	    RPM_OPTS="${RPM_OPTS} --without $1"
+	    ;;
 	--sign)
 	    with_sign=1
 	    ;;