Some updates to fix the normal repo

check-files.sh

@@ -1,127 +0,0 @@
-#!/bin/bash
-
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>
-
-
-
-_script_name="check files"
-_cur_repo=$(pwd | awk -F '/' '{print $NF}')
-_needed_functions="config_handling helpers messages"
-_build_arch="$_arch"
-_sarch="x32"
-[[ ${_arch} = *x*64* ]] && _sarch="x64"
-
-# helper functions
-for subroutine in ${_needed_functions} ; do
-	source _buildscripts/functions/${subroutine}
-done
-
-# Determine the sync folder
-if [[ ${_cur_repo} = *-testing ]] && [[ ${_cur_repo} != lib32-testing ]] ; then
-	_sync_folder="_testing-${_sarch}/"
-elif [[ ${_cur_repo} = *-unstable ]] ; then
-	_sync_folder="_unstable-${_sarch}/"
-else
-	_sync_folder="_repo/remote/"
-fi
-
-
-title "${_script_name} - $_cur_repo"
-
-check_configs
-load_configs
-
-check_rsync
-check_accounts
-
-sync_down()
-{
-	msg "syncing down"
-	export RSYNC_PASSWORD=$(echo ${_rsync_pass})
-	if [ "${_sync_folder}" = "_testing-${_sarch}/" ] ; then 
-		rsync -avh --progress ${_rsync_user}@${_rsync_server}::dev/testing/$_build_arch/* ${_sync_folder}
-	elif [ "${_sync_folder}" = "_unstable-${_sarch}/" ] ; then 
-		rsync -avh --progress ${_rsync_user}@${_rsync_server}::dev/unstable/$_build_arch/* ${_sync_folder}
-	else
-		rsync -avh --progress ${_rsync_user}@${_rsync_server}::${_rsync_dir}/* ${_sync_folder}
-	fi
-}
-
-remove_packages()
-{
-	# remove the package(s) from sync folder
-	msg "removing the packages(s) from ${_sync_folder}"
-	pushd ${_sync_folder} &>/dev/null
-		rm -rf ${remove_list}
-	popd &>/dev/null
-}
-
-sync_down
-
-# Get the file list in the server
-export RSYNC_PASSWORD=$(echo ${_rsync_pass})
-if [ "${_sync_folder}" = "_testing-${_sarch}/" ] ; then 
-	repo_files=$(rsync -avh --list-only ${_rsync_user}@${_rsync_server}::dev/testing/$_arch/* | awk -F ' ' '{print $NF}')
-elif [ "${_sync_folder}" = "_unstable-${_sarch}/" ] ; then
-	repo_files=$(rsync -avh --list-only ${_rsync_user}@${_rsync_server}::dev/unstable/$_arch/* | awk -F ' ' '{print $NF}')
-else
-	repo_files=$(rsync -avh --list-only ${_rsync_user}@${_rsync_server}::${_rsync_dir}/* | awk -F ' ' '{print $NF}')
-fi
-
-# Get the file list in the sync folder
-local_files=$(ls -a ${_sync_folder}* | awk -F '/' '{print $NF}')
-
-# Get the list of files to remove
-remove_list=""
-for _file in ${local_files} ; do
-	file_exist="false"
-	for _compare_file in ${repo_files} ; do
-		if [ "${_file}" = "${_compare_file}" ] ; then
-			file_exist="true"
-		fi
-	done
-	if [ "${file_exist}" = "false" ] ; then
-		remove_list="${remove_list} ${_file}"
-	fi
-done
-
-if [ "${remove_list}" != "" ] ; then
-	msg "The following packages in ${_sync_folder} don't exist in the sever:"
-	newline
-	echo "${remove_list}"
-	newline
-	question "Do you want to remove the package(s)? (y/n) "
-	while true ; do
-		read yn
-		case ${yn} in
-			[yY]* )
-				newline ;
-				remove_packages ;
-				break ;
-			;;
-			[nN]* )
-				newline ;
-				title "The files will be keeped..." ;
-				newline ;
-				break ;
-			;;
-			* )
-				echo "Enter (y)es or (n)o" ;
-			;;
-		esac
-	done
-fi
-
-title "All done"
-newline

lib32-atk/PKGBUILD

@@ -6,7 +6,7 @@
 _pkgbasename=atk
 pkgname=lib32-$_pkgbasename
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library providing a set of interfaces for accessibility (32-bit)"
 arch=('x86_64')
 license=('LGPL')

lib32-libsm/PKGBUILD

@@ -5,17 +5,17 @@
 
 _pkgbasename=libsm
 pkgname=lib32-$_pkgbasename
-pkgver=1.1.1
+pkgver=1.2.0
-pkgrel=1
+pkgrel=4
 pkgdesc="X11 Session Management library (32-bit)"
 arch=(x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
-depends=('lib32-libice' 'lib32-util-linux-ng' $_pkgbasename=$pkgver)
+depends=('lib32-libice' 'lib32-util-linux' $_pkgbasename=$pkgver)
 makedepends=('xorg-util-macros' 'xtrans' 'gcc-multilib')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libSM-${pkgver}.tar.bz2)
-md5sums=('6889a455496aaaa65b1fa05fc518d179')
+md5sums=('e78c447bf1790552b644eca81b542742')
 
 build() {
   cd "${srcdir}/libSM-${pkgver}"

lib32-libtiff/PKGBUILD

@@ -5,19 +5,17 @@
 
 _pkgbasename=libtiff
 pkgname=lib32-$_pkgbasename
-pkgver=3.9.4
+pkgver=4.0.3
 pkgrel=1
 pkgdesc="Library for manipulation of TIFF images (32-bit)"
 arch=('x86_64')
 url="http://www.remotesensing.org/libtiff/"
 license=('custom')
-depends=('lib32-libjpeg' 'lib32-zlib' $_pkgbasename=$pkgver)
+depends=('lib32-libjpeg-turbo' 'lib32-zlib' $_pkgbasename=$pkgver)
 makedepends=('lib32-libgl' 'lib32-libxmu' 'lib32-libxi' gcc-multilib)
 options=('!libtool')
-source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz \
+source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz)
-        libtiff-CVE-2009-2285.patch)
+md5sums=('051c1068e6a0627f461948c365290410')
-md5sums=('2006c1bdd12644dbf02956955175afd6' 'ff61077408727a82281f77a94f555e2a')
-sha1sums=('a4e32d55afbbcabd0391a9c89995e8e8a19961de' 'eadce8c8bd72ea9c74f35300bf299131813b0c8b')
 
 build() {
   export CC="gcc -m32"
@@ -25,7 +23,6 @@ build() {
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd "${srcdir}/tiff-${pkgver}"
-  patch -p1 < ../libtiff-CVE-2009-2285.patch
   ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --libdir=/usr/lib32
   make
 }

lib32-libtiff/libtiff-CVE-2009-2285.patch

@@ -1,22 +0,0 @@
-Index: tiff-3.8.2/libtiff/tif_lzw.c
-===================================================================
---- tiff-3.8.2.orig/libtiff/tif_lzw.c
-+++ tiff-3.8.2/libtiff/tif_lzw.c
-@@ -421,7 +421,7 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize
- 			NextCode(tif, sp, bp, code, GetNextCode);
- 			if (code == CODE_EOI)
- 				break;
--			if (code == CODE_CLEAR) {
-+			if (code >= CODE_CLEAR) {
- 				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- 				"LZWDecode: Corrupted LZW table at scanline %d",
- 				tif->tif_row);
-@@ -624,7 +624,7 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0,
- 			NextCode(tif, sp, bp, code, GetNextCodeCompat);
- 			if (code == CODE_EOI)
- 				break;
--			if (code == CODE_CLEAR) {
-+			if (code >= CODE_CLEAR) {
- 				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- 				"LZWDecode: Corrupted LZW table at scanline %d",
- 				tif->tif_row);

lib32-util-linux/PKGBUILD

@@ -3,9 +3,9 @@
 # maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
 # maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
 
-_pkgbasename=util-linux-ng
+_pkgbasename=util-linux
 pkgname=lib32-$_pkgbasename
-pkgver=2.19
+pkgver=2.22.1
 pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux (32-bit)"
 url="http://userweb.kernel.org/~kzak/util-linux-ng/"
@@ -14,36 +14,25 @@ depends=('lib32-glibc' $_pkgbasename=$pkgver)
 makedepends=('gcc-multilib')
 license=('GPL2')
 options=('!libtool' '!emptydirs')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${_pkgbasename}/v${pkgver}/util-linux-${pkgver}.tar.bz2)
+source=(ftp://ftp.kernel.org/pub/linux/utils/${_pkgbasename}/v2.22/util-linux-${pkgver}.tar.bz2)
+md5sums=('cad23c41a014af766d467b86628bd0fd')
 
-md5sums=('590ca71aad0b254e2631d84401f28255')
+shopt -s extglob
 
 build() {
-  cd "${srcdir}/util-linux-${pkgver}"
+  cd "$_pkgbasename-$pkgver"
-
-  # hardware clock
-  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c
-  mkdir -p "${pkgdir}/var/lib/hwclock"
 
   export CC="gcc -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  autoreconf
-  automake
   ./configure --without-ncurses --libdir=/usr/lib32
 
-#  make -C shlibs
+  make lib{uuid,blkid,mount}.la
-   make
 }
 
 package() {
-  cd "${srcdir}/util-linux-${pkgver}"
+  make -C "$_pkgbasename-$pkgver" \
-
+    DESTDIR="$pkgdir" \
-#  make -C shlibs DESTDIR="${pkgdir}" install
+    install-usrlib_execLTLIBRARIES \
-   make DESTDIR="${pkgdir}" install
+    install-pkgconfigDATA
-
-  # remove files
-  rm -rf "${pkgdir}"/{sbin,bin}
-  rm -rf "${pkgdir}"/usr/{include,share,sbin,bin}
 }
-

lib32-zlib/PKGBUILD

@@ -6,7 +6,7 @@
 _pkgbasename=zlib
 pkgname=lib32-$_pkgbasename
 pkgver=1.2.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP (32-bit)'
 arch=('x86_64')
 license=('custom')