Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:42:38 JST 2012
Kouhei Sutou 2012-04-23 17:15:14 +0900 (Mon, 23 Apr 2012) New Revision: 1a78513f7ca243ce74da9e8160fc5eaf7e2bc828 https://github.com/mroonga/mroonga/commit/1a78513f7ca243ce74da9e8160fc5eaf7e2bc828 Merged d2a70dc: Merge branch 'master' of github.com:mroonga/mroonga Log: apt: enable security update Modified files: packages/apt/build-deb.sh packages/apt/build-in-chroot.sh Modified: packages/apt/build-deb.sh (+19 -0) =================================================================== --- packages/apt/build-deb.sh 2012-04-23 17:03:50 +0900 (1b4bb26) +++ packages/apt/build-deb.sh 2012-04-23 17:15:14 +0900 (88ccc84) @@ -7,6 +7,7 @@ USER_NAME=$(cat /tmp/build-user) VERSION=$(cat /tmp/build-version) DEPENDED_PACKAGES=$(cat /tmp/depended-packages) BUILD_SCRIPT=/tmp/build-deb-in-chroot.sh +CODE_NAME=$(cat /tmp/code-name) mysql_server_package=mysql-server-5.1 @@ -22,6 +23,24 @@ run() grep '^deb ' /etc/apt/sources.list | \ sed -e 's/^deb /deb-src /' > /etc/apt/sources.list.d/base-source.list +case $code_name in + lenny|squeeze|wheezy) + cat <<EOF > /etc/apt/sources.list.d/security.list +deb http://security.debian.org/ ${code_name}/updates main +deb-src http://security.debian.org/ ${code_name}/updates main +EOF + ;; + unstable) + : + ;; + *) + cat <<EOF > /etc/apt/sources.list.d/security.list +deb http://security.ubuntu.com/ubuntu ${code_name}-security main restricted +deb-src http://security.ubuntu.com/ubuntu ${code_name}-security main restricted +EOF + ;; +esac + groonga_apt_key=1C837F31 if ! apt-key list | grep -q ${groonga_apt_key}; then apt-key adv --recv-keys --keyserver keyserver.ubuntu.com ${groonga_apt_key} Modified: packages/apt/build-in-chroot.sh (+1 -1) =================================================================== --- packages/apt/build-in-chroot.sh 2012-04-23 17:03:50 +0900 (34fd805) +++ packages/apt/build-in-chroot.sh 2012-04-23 17:15:14 +0900 (7cffc40) @@ -51,7 +51,6 @@ build_chroot() run_sudo sed -i'' \ -e 's,http://archive,http://jp.archive,' \ -e 's/main$/main universe/' \ - -e "\$adeb http://security.ubuntu.com/ubuntu ${code_name}-security main universe" \ $base_dir/etc/apt/sources.list ;; esac @@ -104,6 +103,7 @@ build() run echo $PACKAGE > ${CHROOT_BASE}/$target/tmp/build-package run echo $VERSION > ${CHROOT_BASE}/$target/tmp/build-version run echo $build_user > ${CHROOT_BASE}/$target/tmp/build-user + run echo $code_name > ${CHROOT_BASE}/$target/tmp/code-name run cp ${script_base_dir}/${PACKAGE}-depended-packages \ ${CHROOT_BASE}/$target/tmp/depended-packages run cp ${script_base_dir}/build-deb.sh \ -------------- next part -------------- HTML����������������������������...Download