From 36eb07546b8fa2d50d59f7ac85fc5c9238d4c5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Fri, 12 Feb 2016 19:09:52 +0100 Subject: Integrated OpenSSH v7.1p2. --- 314.openssh.build | 1 + build.vars | 39 +++++++++++++++++++++++---------------- openssh-7.1p2.local.patch | 21 +++++++++++++++++++++ pkg.build | 11 +++++++---- 4 files changed, 52 insertions(+), 20 deletions(-) create mode 120000 314.openssh.build create mode 100644 openssh-7.1p2.local.patch diff --git a/314.openssh.build b/314.openssh.build new file mode 120000 index 00000000..52bb82e5 --- /dev/null +++ b/314.openssh.build @@ -0,0 +1 @@ +pkg.build \ No newline at end of file diff --git a/build.vars b/build.vars index 45add8bd..2bb88169 100644 --- a/build.vars +++ b/build.vars @@ -23,7 +23,7 @@ : ${PREFIX:=${HOME}/midipix}; : ${PREFIX_NATIVE:=${PREFIX}/native}; : ${TARGET:=x86_64-nt64-midipix}; -: ${PKG_VARS:="build_dir build_type configure_args configure_args_extra git_args_extra makeflags_build_extra no_clean no_config_cache no_configure no_destdir no_libtool_midipix no_patch_local patches_extra_url prefix prefix_extra unset_vars_build sha256sum subdir url url_type version AR CC CFLAGS LD LDFLAGS MAKEFLAGS PREFIX RANLIB"}; +: ${PKG_VARS:="build_dir build_type configure_args configure_args_extra git_args_extra install_target makeflags_build_extra no_clean no_config_cache no_configure no_destdir no_libtool_midipix no_patch_local patches_extra_url prefix prefix_extra unset_vars_build sha256sum subdir url url_type version AR CC CFLAGS LD LDFLAGS MAKEFLAGS PREFIX RANLIB"}; : ${PREFIX_TARGET:=${PREFIX}/${TARGET}}; : ${PREFIX_LVL0:=${PREFIX_TARGET}}; : ${PREFIX_LVL1:=${PREFIX_NATIVE}}; @@ -36,14 +36,14 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${WGET_ARGS:="-N --no-check-certificate"}; : ${PKG_LVL0_CONFIGURE_ARGS:="-C --host=${HOST_NATIVE} --prefix= --target=${TARGET}"}; -: ${PKG_LVL1_CONFIGURE_ARGS="--host=${HOST_NATIVE} --target=${TARGET}"}; +: ${PKG_LVL1_CONFIGURE_ARGS:="--host=${HOST_NATIVE} --target=${TARGET}"}; : ${PKG_LVL2_BUILD_TYPE:=cross}; : ${PKG_LVL2_CONFIGURE_ARGS:="--prefix=${PREFIX_LVL2} --host=${HOST_NATIVE}"}; : ${PKG_LVL2_NO_CONFIG_CACHE:=1}; : ${PKG_LVL2_NO_DESTDIR:=1}; : ${PKG_LVL2_NO_EXTRACT:=1}; : ${PKG_LVL2_URL_TYPE:=git}; -: ${PKG_LVL2_UNSET_VAR_BUILD:="CC LD CFLAGS LDFLAGS PREFIX"}; +: ${PKG_LVL2_UNSET_VARS_BUILD:="CC LD CFLAGS LDFLAGS PREFIX"}; : ${PKG_LVL2_CFLAGS_PATH:=-I${PREFIX_LVL2}/include}; : ${PKG_LVL2_LDFLAGS_PATH:=-L${PREFIX_LVL2}/include}; : ${PKG_LVL3_CONFIGURE_ARGS:="-C --host=${HOST_NATIVE} --prefix= --target=${TARGET}"}; @@ -58,7 +58,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_BZIP2_PREFIX:=${PREFIX_LVL3}}; : ${PKG_BZIP2_SHA256SUM:=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd}; : ${PKG_BZIP2_VERSION:=1.0.6}; -: ${PKG_BZIP2_BUILD_DIR=bzip2-${PKG_BZIP2_VERSION}}; +: ${PKG_BZIP2_BUILD_DIR:=bzip2-${PKG_BZIP2_VERSION}}; : ${PKG_BZIP2_URL:=http://www.bzip.org/1.0.6/bzip2-${PKG_BZIP2_VERSION}.tar.gz}; : ${PKG_BASH_CONFIGURE_ARGS_EXTRA:=--without-bash-malloc}; : ${PKG_BASH_LDFLAGS:=-L${PREFIX_LVL3}/lib}; @@ -95,15 +95,15 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_GAWK_URL:=https://ftp.gnu.org/gnu/gawk/gawk-${PKG_GAWK_VERSION}.tar.xz}; : ${PKG_GCC_VERSION:=4.6.4}; : ${PKG_GIT_SUBDIR:=git}; -: ${PKG_GIT_BUILD_DIR=${PKG_GIT_SUBDIR}}; -: ${PKG_GIT_AR=${HOST_NATIVE}-ar}; -: ${PKG_GIT_CC=${HOST_NATIVE}-gcc}; -: ${PKG_GIT_CFLAGS=-I. -I${PREFIX_LVL3}/include}; -: ${PKG_GIT_LDFLAGS=-L${PREFIX_LVL3}/lib}; -: ${PKG_GIT_MAKEFLAGS=NO_CURL=1 V=99}; +: ${PKG_GIT_BUILD_DIR:=${PKG_GIT_SUBDIR}}; +: ${PKG_GIT_AR:=${HOST_NATIVE}-ar}; +: ${PKG_GIT_CC:=${HOST_NATIVE}-gcc}; +: ${PKG_GIT_CFLAGS:=-I. -I${PREFIX_LVL3}/include}; +: ${PKG_GIT_LDFLAGS:=-L${PREFIX_LVL3}/lib}; +: ${PKG_GIT_MAKEFLAGS:=NO_CURL=1 V=99}; : ${PKG_GIT_GIT_ARGS_EXTRA:=--branch v2.7.1}; : ${PKG_GIT_NO_CONFIGURE:=1}; -: ${PKG_GIT_RANLIB=${HOST_NATIVE}-ranlib}; +: ${PKG_GIT_RANLIB:=${HOST_NATIVE}-ranlib}; : ${PKG_GIT_URL:=https://github.com/git/git.git}; : ${PKG_GIT_URL_TYPE:=git}; : ${PKG_GMP_CONFIGURE_ARGS_EXTRA:=--disable-assembly}; @@ -157,18 +157,25 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_MUSL_SHA256SUM:=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e}; : ${PKG_MUSL_VERSION:=1.1.12}; : ${PKG_MUSL_URL:=http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz}; -: ${PKG_NCURSES_SHA256SUM=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260}; -: ${PKG_NCURSES_VERSION=6.0}; +: ${PKG_NCURSES_SHA256SUM:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260}; +: ${PKG_NCURSES_VERSION:=6.0}; : ${PKG_NCURSES_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSES_VERSION}.tar.gz}; +: ${PKG_OPENSSH_CFLAGS:=-I${PREFIX_LVL3}/include}; +: ${PKG_OPENSSH_INSTALL_TARGET:=install-nokeys}; +: ${PKG_OPENSSH_LDFLAGS:=-L${PREFIX_LVL3}/lib}; +: ${PKG_OPENSSH_SHA256SUM:=dd75f024dcf21e06a0d6421d582690bf987a1f6323e32ad6619392f3bfde6bbd}; +: ${PKG_OPENSSH_VERSION:=7.1p2}; +: ${PKG_OPENSSH_URL:=http://artfiles.org/openbsd/OpenSSH/portable/openssh-${PKG_OPENSSH_VERSION}.tar.gz}; +: ${PKG_OPENSSH_UNSET_VARS_BUILD:=CFLAGS LDFLAGS}; : ${PKG_PATCH_SHA256SUM:=59c29f56faa0a924827e6a60c6accd6e2900eae5c6aaa922268c717f06a62048}; : ${PKG_PATCH_VERSION:=2.7}; : ${PKG_PATCH_URL:=https://ftp.gnu.org/gnu/patch/patch-${PKG_PATCH_VERSION}.tar.gz}; : ${PKG_POPT_SHA256SUM:=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8}; : ${PKG_POPT_VERSION:=1.16}; : ${PKG_POPT_URL:=http://rpm5.org/files/popt/popt-${PKG_POPT_VERSION}.tar.gz}; -: ${PKG_RSYNC_CFLAGS=-I${PREFIX_LVL3}/include}; -: ${PKG_RSYNC_CONFIGURE_ARGS_EXTRA=--with-included-zlib}; -: ${PKG_RSYNC_LDFLAGS=-L${PREFIX_LVL3}/lib}; +: ${PKG_RSYNC_CFLAGS:=-I${PREFIX_LVL3}/include}; +: ${PKG_RSYNC_CONFIGURE_ARGS_EXTRA:=--with-included-zlib}; +: ${PKG_RSYNC_LDFLAGS:=-L${PREFIX_LVL3}/lib}; : ${PKG_RSYNC_VERSION:=3.1.2}; : ${PKG_RSYNC_URL:=https://download.samba.org/pub/rsync/src/rsync-${PKG_RSYNC_VERSION}.tar.gz}; : ${PKG_TAR_SHA256SUM:=6a6b65bac00a127a508533c604d5bf1a3d40f82707d56f20cefd38a05e8237de}; diff --git a/openssh-7.1p2.local.patch b/openssh-7.1p2.local.patch new file mode 100644 index 00000000..cea0e8f0 --- /dev/null +++ b/openssh-7.1p2.local.patch @@ -0,0 +1,21 @@ +--- openssh-7.1p2/config.sub.orig 2016-01-14 02:10:45.000000000 +0100 ++++ openssh-7.1p2/config.sub 2016-02-12 18:37:49.533329800 +0100 +@@ -794,6 +794,9 @@ + microblaze*) + basic_machine=microblaze-xilinx + ;; ++ midipix) ++ os=-midipix ++ ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 +@@ -1370,7 +1373,7 @@ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ diff --git a/pkg.build b/pkg.build index ac7bd852..e357912f 100644 --- a/pkg.build +++ b/pkg.build @@ -7,8 +7,9 @@ parse_with_pkg_name ${2} \ bash binutils binutils_host bzip2 coreutils \ dalist dash diffutils findutils gawk git gmp \ grep gzip less libelf libressl libz make mpc mpfr \ - ncurses ntapi ntcon ntctty patch pemagine popt psxscl \ - psxstub psxtypes rsync sed tar util_linux which xz; + ncurses ntapi ntcon ntctty openssh patch pemagine \ + popt psxscl psxstub psxtypes rsync sed tar util_linux \ + which xz; case "${SCRIPT_FNAME%[0-9][0-9]*}" in 1) _configure_args="--host=${HOST_NATIVE} --prefix=${PKG_PREFIX:-/} --target=${TARGET}"; PKG_NO_CONFIG_CACHE=1; ;; @@ -110,7 +111,8 @@ if ! is_build_script_done install1; then ${CC:+CC=${CC}} ${CFLAGS:+"CFLAGS=${CFLAGS}"} \ ${LD:+LD=${LD}} ${LDFLAGS:+"LDFLAGS=${LDFLAGS}"}\ ${RANLIB:+RANLIB=${RANLIB}} \ - DESTDIR=${PREFIX_LVL} install; + DESTDIR=${PREFIX_LVL} \ + ${PKG_INSTALL_TARGET:-install}; else make ${PKG_MAKEFLAGS_INSTALL_EXTRA:+${PKG_MAKEFLAGS_BUILD_EXTRA}}\ ${MAKEFLAGS} \ @@ -118,7 +120,8 @@ if ! is_build_script_done install1; then ${CC:+CC=${CC}} ${CFLAGS:+"CFLAGS=${CFLAGS}"} \ ${LD:+LD=${LD}} ${LDFLAGS:+"LDFLAGS=${LDFLAGS}"}\ ${PREFIX:+PREFIX=${PREFIX}} \ - ${RANLIB:+RANLIB=${RANLIB}} install; + ${RANLIB:+RANLIB=${RANLIB}} \ + ${PKG_INSTALL_TARGET:-install}; fi; set_build_script_done install1 -install2 -finish; fi; -- cgit v1.2.3