Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
List overview
Download
scm-commits
March 2012
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
scm-commits@lists.fedoraproject.org
455 participants
19627 discussions
Start a n
N
ew thread
[flashrom] svn rev. 1517
by Peter Lemenkov
31 Mar '12
31 Mar '12
commit f4ee62f185bcbbd87085b1c004b578f81166495d Author: Peter Lemenkov <lemenkov(a)gmail.com> Date: Sat Mar 31 21:16:30 2012 +0400 svn rev. 1517 Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> .gitignore | 1 + ...Initial-commit-of-autotools-related-files.patch | 127 ++++++++++++++++---- ...dmidecode-path-defined-at-configure-stage.patch | 12 +- ...from-configure-stage-instead-of-HAVE_UTSN.patch | 18 ++-- ...86-related-ifdefs-in-code-this-is-now-con.patch | 22 ++-- flashrom-0005-Simplify-hwaccess.c.patch | 83 ++++++++++--- ...diannes-determined-at-the-configure-stage.patch | 25 +++-- ...Use-HAVE_-_H-macro-for-detecting-includes.patch | 42 ++++--- ...ove-arch-checking-ifdef-block-into-header.patch | 64 ---------- ...-ppc-hack.patch => flashrom-0008-ppc-hack.patch | 10 +- ...tch => flashrom-0009-Simplify-processor.h.patch | 8 +- flashrom.spec | 23 +++-- sources | 2 +- 13 files changed, 257 insertions(+), 180 deletions(-) --- diff --git a/.gitignore b/.gitignore index f1447e6..50461c2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ flashrom-0.9.2.tar.bz2 /flashrom-0.9.3.tar.xz /flashrom-0.9.3.tar.bz2 /flashrom-0.9.4.tar.bz2 +/flashrom-0.9.5.2.tar.bz2 diff --git a/flashrom-0001-Initial-commit-of-autotools-related-files.patch b/flashrom-0001-Initial-commit-of-autotools-related-files.patch index b2f6122..f37f0e1 100644 --- a/flashrom-0001-Initial-commit-of-autotools-related-files.patch +++ b/flashrom-0001-Initial-commit-of-autotools-related-files.patch @@ -1,24 +1,24 @@ -From 0b786729ee0094d33ea88beac62b89ba8b66aa54 Mon Sep 17 00:00:00 2001 +From f1082ad2316f9257eaf3a6a1672593fa0cf66c79 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov <lemenkov(a)gmail.com> Date: Fri, 17 Sep 2010 18:58:28 +0400 -Subject: [PATCH 01/10] Initial commit of autotools-related files +Subject: [PATCH 1/9] Initial commit of autotools-related files Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> --- - Makefile.am | 210 +++++++++++++++++++++++++++++++++++++++++++++++ - bootstrap.sh | 5 + - configure.ac | 257 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 472 insertions(+), 0 deletions(-) + Makefile.am | 211 +++++++++++++++++++++++++++++++++++++ + bootstrap.sh | 4 + + configure.ac | 332 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 547 insertions(+) create mode 100644 Makefile.am create mode 100755 bootstrap.sh create mode 100644 configure.ac diff --git a/Makefile.am b/Makefile.am new file mode 100644 -index 0000000..cd203b8 +index 0000000..24fe251 --- /dev/null +++ b/Makefile.am -@@ -0,0 +1,210 @@ +@@ -0,0 +1,211 @@ +sbin_PROGRAMS = flashrom + +man_MANS = flashrom.8 @@ -179,6 +179,7 @@ index 0000000..cd203b8 + m29f400bt.c \ + opaque.c \ + pm49fl00x.c \ ++ sfdp.c \ + spi.c \ + spi25.c \ + sst_fwhub.c \ @@ -231,29 +232,28 @@ index 0000000..cd203b8 + $(lib_SOURCES) diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100755 -index 0000000..050fe4f +index 0000000..0213288 --- /dev/null +++ b/bootstrap.sh -@@ -0,0 +1,5 @@ +@@ -0,0 +1,4 @@ +#!/bin/sh +aclocal --force +/usr/bin/autoconf --force -+/usr/bin/autoheader --force +automake --add-missing --copy --force-missing diff --git a/configure.ac b/configure.ac new file mode 100644 -index 0000000..c795ce8 +index 0000000..5870714 --- /dev/null +++ b/configure.ac -@@ -0,0 +1,257 @@ -+AC_INIT([flashrom], [0.9.4-r1487], [flashrom(a)flashrom.org] [flashrom], [
http://www.flashrom.org/
] +@@ -0,0 +1,332 @@ ++AC_INIT([flashrom], [0.9.5.2-r1517], [flashrom(a)flashrom.org] [flashrom], [
http://www.flashrom.org/
] + +AC_PREREQ(2.59) + +AC_CANONICAL_TARGET + +AC_CONFIG_SRCDIR([flashrom.c]) -+AM_INIT_AUTOMAKE([foreign]) ++AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip tar-ustar foreign]) + +# Internal (mainboard) flashing +AC_ARG_WITH([internal], @@ -265,10 +265,6 @@ index 0000000..c795ce8 + AC_HELP_STRING([--with-serprog],[serprog support.]), + [serprog="$withval"],[serprog="yes"]) + -+AC_ARG_WITH([linux_spi], -+ AC_HELP_STRING([--with-linux-spi],[Linux SPI subsystem support.]), -+ [linux_spi="$withval"],[linux_spi="no"]) -+ +AC_ARG_WITH([rayer_spi], + AC_HELP_STRING([--with-rayer-spi],[RayeR SPIPGM hardware support.]), + [rayer_spi="$withval"],[rayer_spi="yes"]) @@ -346,13 +342,15 @@ index 0000000..c795ce8 + ) + +# Check for CPU-specific features -+case $target_cpu in ++case "$target_cpu" in + i386|i486|i586|i686|i786|x86_64) + if test "$internal" = 'yes'; then + enable_x86_only_internal="yes" + fi ++ AC_CHECK_HEADERS([sys/io.h]) + ;; -+ mips*|power*) ++ mips*|power*|arm*) ++ enable_x86_only_internal="n/a" + if test "$nic3com" = 'yes'; then + AC_MSG_WARN([NIC 3Com is not supported for this target ($target_cpu). No PCI port I/O access on this architecture yet.]) + nic3com="no" @@ -379,12 +377,50 @@ index 0000000..c795ce8 + fi + ;; + *) -+ AC_MSG_ERROR([No support for this target ($target_cpu) yet]) ++ AC_MSG_ERROR([No support for this CPU ($target_cpu) yet]) + ;; +esac + +# Enable OS-specific compilation flags -+# TODO ++case "$target_os" in ++ linux*) ++ AC_CHECK_HEADERS([sys/ioctl.h]) ++ AC_ARG_WITH( ++ [linux_spi], ++ AC_HELP_STRING([--with-linux-spi],[Linux SPI subsystem support.]), ++ [linux_spi="$withval"], ++ [linux_spi="yes"] ++ ) ++ if test "$linux_spi" = "yes" ; then ++ AC_CHECK_HEADERS([linux/types.h], [], [AC_MSG_ERROR([<linux/types.h> not found])], []) ++ AC_CHECK_HEADERS([linux/spi/spidev.h], [], [AC_MSG_ERROR([<linux/spi/spidev.h> not found])], []) ++ fi ++ ;; ++ darwin*) ++ AC_CHECK_HEADERS([DirectIO/darwinio.h DirectHW/DirectHW.h]) ++ ;; ++ freebsd*) ++ AC_CHECK_HEADERS([machine/cpufunc.h]) ++ ;; ++ openbsd*) ++ AC_CHECK_HEADERS([machine/sysarch.h sys/types.h]) ++ ;; ++ netbsd*) ++ AC_CHECK_HEADERS([machine/sysarch.h sys/types.h]) ++ ;; ++ *solaris*) ++ AC_CHECK_HEADERS([asm/sunddi.h strings.h sys/psw.h sys/sysi86.h]) ++ ;; ++ mingw*) ++ # TODO ++ ;; ++ *djgpp*) ++ AC_CHECK_HEADERS([pc.h]) ++ ;; ++ *) ++ AC_MSG_ERROR([No support for this OS ($target_os) yet]) ++ ;; ++esac + +# Check whether we need seial support +if test "$serprog" = 'yes' -o \ @@ -424,7 +460,7 @@ index 0000000..c795ce8 +AC_PATH_PROG([DMIDECODE], dmidecode, [], [$PATH$PATH_SEPARATOR/usr/sbin]) + +# Checks for header files. -+AC_CHECK_HEADERS([DirectIO/darwinio.h arpa/inet.h asm/sunddi.h fcntl.h inttypes.h limits.h machine/cpufunc.h machine/sysarch.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/io.h sys/ioctl.h sys/psw.h sys/socket.h sys/sysi86.h sys/time.h sys/utsname.h termios.h unistd.h]) ++AC_CHECK_HEADERS([limits.h stddef.h stdint.h stdlib.h string.h sys/time.h sys/utsname.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_C_INLINE @@ -448,7 +484,7 @@ index 0000000..c795ce8 +AC_FUNC_MALLOC +AC_FUNC_MMAP +AC_FUNC_REALLOC -+AC_CHECK_FUNCS([gethostbyaddr gethostbyname getpagesize gettimeofday memmove memset munmap socket strcasecmp strchr strcspn strdup strerror strncasecmp strspn strstr strtol strtoul uname]) ++AC_CHECK_FUNCS([getpagesize gettimeofday memmove memset munmap strcasecmp strchr strcspn strdup strerror strncasecmp strspn strstr strtol strtoul uname]) + +# Checks for pcilib +if test "$pci" = 'yes' ; then @@ -458,6 +494,8 @@ index 0000000..c795ce8 +# check for socket (required for SunOS) +if test "$serprog" = 'yes' ; then + AC_CHECK_LIB([socket], [socket]) ++ AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h netdb.h netinet/in.h sys/socket.h termios.h unistd.h]) ++ AC_CHECK_FUNCS([gethostbyaddr gethostbyname socket]) +fi + +# Check for libusb @@ -503,6 +541,43 @@ index 0000000..c795ce8 + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT ++ ++AC_MSG_RESULT([ ++------------------------------------------------------------------------ ++ $PACKAGE $VERSION configuration. ++ ++ Compiler support: ++ ++ Target CPU: ................... ${target_cpu} ++ Target OS: .................... ${target_os} ++ ++ Suppored programmers: ++ ++ Internal: ..................... ${internal} ++ x86-only features: .......... ${enable_x86_only_internal} ++ serprog: ...................... ${serprog} ++ Linux SPI: .................... ${linux_spi} ++ RayeR SPI: .................... ${rayer_spi} ++ Bitbang SPI: .................. ${bitbang_spi} ++ 3COM NIC: ..................... ${nic3com} ++ NVIDIA GFX: ................... ${gfxnvidia} ++ Open Graphics Project GFX: .... ${gfxogp} ++ Silicon Image SATA: ........... ${satasii} ++ Highpoint ATA: ................ ${atahpt} ++ FT232 SPI: .................... ${ft2232_spi} ++ Dummy: ........................ ${dummy} ++ Dr. Kaiser: ................... ${drkaiser} ++ Realtek NIC: .................. ${nicrealtek} ++ National Semiconductor NIC: ... ${nicnatsemi} ++ Intel NIC: .................... ${nicintel} ++ Intel NIC SPI: ................ ${nicintel_spi} ++ Bus Pirate SPI: ............... ${buspirate_spi} ++ Dediprog SF100: ............... ${dediprog} ++ Marvell SATA: ................. ${satamv} ++ Serial: ....................... ${serial} ++ ++------------------------------------------------------------------------ ++]) -- -1.7.7.5 +1.7.9.3 diff --git a/flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch b/flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch index bf0cfb1..14e5527 100644 --- a/flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch +++ b/flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch @@ -1,18 +1,18 @@ -From 9f98c4a7ab4712091d963fbb8eda53f6ca2c442f Mon Sep 17 00:00:00 2001 +From ff41aca7925147681ec29e9a1e5a302eef0addcc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov <lemenkov(a)gmail.com> Date: Sat, 12 Jun 2010 22:13:53 +0400 -Subject: [PATCH 02/10] Use dmidecode path defined at configure stage +Subject: [PATCH 2/9] Use dmidecode path defined at configure stage Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> --- dmi.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dmi.c b/dmi.c -index 5f64b94..537c2d5 100644 +index 2c2551d..6f62fc0 100644 --- a/dmi.c +++ b/dmi.c -@@ -85,7 +85,7 @@ static const struct { +@@ -86,7 +86,7 @@ static const struct { }; #define DMI_COMMAND_LEN_MAX 260 @@ -22,5 +22,5 @@ index 5f64b94..537c2d5 100644 static char *dmistrings[ARRAY_SIZE(dmidecode_names)]; -- -1.7.7.5 +1.7.9.3 diff --git a/flashrom-0003-Use-macros-from-configure-stage-instead-of-HAVE_UTSN.patch b/flashrom-0003-Use-macros-from-configure-stage-instead-of-HAVE_UTSN.patch index c98256f..10d6aed 100644 --- a/flashrom-0003-Use-macros-from-configure-stage-instead-of-HAVE_UTSN.patch +++ b/flashrom-0003-Use-macros-from-configure-stage-instead-of-HAVE_UTSN.patch @@ -1,8 +1,7 @@ -From 519e44ea557387ec0eb1ca77ea3f42de8a89b267 Mon Sep 17 00:00:00 2001 +From 2afeaf03a24e253c4bcfed49155bc7ef264fe1b4 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov <lemenkov(a)gmail.com> Date: Sat, 18 Sep 2010 09:05:43 +0400 -Subject: [PATCH 03/10] Use macros from configure stage instead of - HAVE_UTSNAME +Subject: [PATCH 3/9] Use macros from configure stage instead of HAVE_UTSNAME Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> --- @@ -12,7 +11,7 @@ Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am -index cd203b8..27c6b36 100644 +index 24fe251..c56efd1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,12 +5,6 @@ man_MANS = flashrom.8 @@ -29,10 +28,10 @@ index cd203b8..27c6b36 100644 DEFS += -DDMIDECODE_PATH=\"@DMIDECODE@\" else diff --git a/configure.ac b/configure.ac -index c795ce8..194838f 100644 +index 5870714..e669b2c 100644 --- a/configure.ac +++ b/configure.ac -@@ -249,9 +249,5 @@ AM_CONDITIONAL(HAVE_SERIAL, test "$serial" = "yes") +@@ -287,10 +287,6 @@ AM_CONDITIONAL(HAVE_SERIAL, test "$serial" = "yes") AM_CONDITIONAL(HAVE_PCI, test "$pci" = "yes") AM_CONDITIONAL(HAVE_PRINT_WIKI, test "$print_wiki" = "yes") @@ -42,8 +41,9 @@ index c795ce8..194838f 100644 - AC_CONFIG_FILES([Makefile]) AC_OUTPUT + diff --git a/flashrom.c b/flashrom.c -index ee68344..5208f28 100644 +index cad043b..10f43f4 100644 --- a/flashrom.c +++ b/flashrom.c @@ -31,7 +31,8 @@ @@ -56,7 +56,7 @@ index ee68344..5208f28 100644 #include <sys/utsname.h> #endif #include "flash.h" -@@ -1449,7 +1450,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren) +@@ -1474,7 +1475,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren) void print_sysinfo(void) { @@ -66,5 +66,5 @@ index ee68344..5208f28 100644 uname(&osinfo); -- -1.7.7.5 +1.7.9.3 diff --git a/flashrom-0004-Kill-some-x86-related-ifdefs-in-code-this-is-now-con.patch b/flashrom-0004-Kill-some-x86-related-ifdefs-in-code-this-is-now-con.patch index fb9127c..422cbb1 100644 --- a/flashrom-0004-Kill-some-x86-related-ifdefs-in-code-this-is-now-con.patch +++ b/flashrom-0004-Kill-some-x86-related-ifdefs-in-code-this-is-now-con.patch @@ -1,7 +1,7 @@ -From 5381ae7e3423475d5ade49bd11b5844e68f4fdc7 Mon Sep 17 00:00:00 2001 +From c1942ed484853d4c97e6bc8e66a7e03f47180c34 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov <lemenkov(a)gmail.com> Date: Sat, 18 Sep 2010 09:40:01 +0400 -Subject: [PATCH 04/10] Kill some x86-related ifdefs in code - this is now +Subject: [PATCH 4/9] Kill some x86-related ifdefs in code - this is now controlled via autotools Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> @@ -20,7 +20,7 @@ Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> satamv.c | 5 ----- sb600spi.c | 4 ---- wbsio_spi.c | 4 ---- - 14 files changed, 0 insertions(+), 63 deletions(-) + 14 files changed, 63 deletions(-) diff --git a/atahpt.c b/atahpt.c index 4234f6d..27b106d 100644 @@ -79,7 +79,7 @@ index 34bcc6a..690ba6a 100644 #endif /* __ICH_DESCRIPTORS_H__ */ -#endif /* defined(__i386__) || defined(__x86_64__) */ diff --git a/ichspi.c b/ichspi.c -index 163ecf1..f81d88c 100644 +index 403d763..6ecf50a 100644 --- a/ichspi.c +++ b/ichspi.c @@ -23,8 +23,6 @@ @@ -91,7 +91,7 @@ index 163ecf1..f81d88c 100644 #include <string.h> #include <stdlib.h> #include "flash.h" -@@ -1839,5 +1837,3 @@ int via_init_spi(struct pci_dev *dev) +@@ -1888,5 +1886,3 @@ int via_init_spi(struct pci_dev *dev) return 0; } @@ -117,7 +117,7 @@ index 01cb086..e911ddf 100644 - -#endif diff --git a/it87spi.c b/it87spi.c -index f089d78..fbd8db2 100644 +index fa37d52..d3ba900 100644 --- a/it87spi.c +++ b/it87spi.c @@ -23,8 +23,6 @@ @@ -277,7 +277,7 @@ index c3d7710..458206a 100644 - -#endif diff --git a/wbsio_spi.c b/wbsio_spi.c -index 740a48c..7c4ff57 100644 +index 774890e..f6076aa 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -18,8 +18,6 @@ @@ -289,12 +289,12 @@ index 740a48c..7c4ff57 100644 #include "flash.h" #include "chipdrivers.h" #include "programmer.h" -@@ -204,5 +202,3 @@ static int wbsio_spi_read(struct flashctx *flash, uint8_t *buf, - { - return read_memmapped(flash, buf, start, len); +@@ -205,5 +203,3 @@ static int wbsio_spi_read(struct flashctx *flash, uint8_t *buf, + mmio_readn((void *)(flash->virtual_memory + start), buf, len); + return 0; } - -#endif -- -1.7.7.5 +1.7.9.3 diff --git a/flashrom-0005-Simplify-hwaccess.c.patch b/flashrom-0005-Simplify-hwaccess.c.patch index ee74b25..6f7cdd2 100644 --- a/flashrom-0005-Simplify-hwaccess.c.patch +++ b/flashrom-0005-Simplify-hwaccess.c.patch @@ -1,7 +1,7 @@ -From a96a6cc8d45f274614826f30e26b92ed33f5e1f3 Mon Sep 17 00:00:00 2001 +From 8530143c1daf10e4e2564be7eef680c2cd8d82ee Mon Sep 17 00:00:00 2001 From: Peter Lemenkov <lemenkov(a)gmail.com> Date: Tue, 21 Sep 2010 17:51:08 +0400 -Subject: [PATCH 05/10] Simplify hwaccess.c +Subject: [PATCH 5/9] Simplify hwaccess.c This file is saturated with superfluous ifdefs arranged into several nested levels. This in turn adds additional complexity @@ -12,26 +12,19 @@ definitions. Also I added define(__amd64) to the list of x86-arches. Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> --- - hwaccess.c | 85 +++++++++++++++++++++-------------------------------------- - 1 files changed, 30 insertions(+), 55 deletions(-) + hwaccess.c | 92 +++++++++++++++--------------------------------------------- + hwaccess.h | 18 +----------- + 2 files changed, 24 insertions(+), 86 deletions(-) diff --git a/hwaccess.c b/hwaccess.c -index 8c89925..f10d957 100644 +index 571edd7..62065de 100644 --- a/hwaccess.c +++ b/hwaccess.c -@@ -31,30 +31,47 @@ - #endif +@@ -32,29 +32,39 @@ #include "flash.h" -+#if !( defined(__i386__) || \ -+ defined(__x86_64__) || defined(__amd64) || \ -+ defined (__mips) || defined (__mips__) || defined (_mips) || defined (mips) || \ -+ defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__)) -+#error Unknown architecture -+#endif -+ #if defined(__i386__) || defined(__x86_64__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +int io_fd; +#endif +#endif @@ -43,7 +36,7 @@ index 8c89925..f10d957 100644 { -} - --#if defined(__FreeBSD__) || defined(__DragonFly__) +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -int io_fd; +/* sync primitive is needed only on PowerPC because + * x86 uses uncached accesses which have a strongly ordered memory model @@ -69,14 +62,14 @@ index 8c89925..f10d957 100644 -#if defined (__sun) && (defined(__i386) || defined(__amd64)) +#if defined (__sun) if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) != 0) { - #elif defined(__FreeBSD__) || defined (__DragonFly__) + #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined (__DragonFly__) if ((io_fd = open("/dev/io", O_RDWR)) < 0) { -#else +#else if (iopl(3) != 0) { #endif msg_perr("ERROR: Could not get I/O privileges (%s).\n" -@@ -67,60 +84,18 @@ void get_io_perms(void) +@@ -67,74 +77,18 @@ void get_io_perms(void) exit(1); } #endif @@ -87,7 +80,7 @@ index 8c89925..f10d957 100644 { +/* PCI port I/O is not yet implemented on PowerPC or MIPS. */ +#if defined(__i386__) || defined(__x86_64__) || defined(__amd64) - #if defined(__FreeBSD__) || defined(__DragonFly__) + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) close(io_fd); #endif -} @@ -132,6 +125,20 @@ index 8c89925..f10d957 100644 -{ -} - +-#elif defined (__arm__) +- +-static inline void sync_primitive(void) +-{ +-} +- +-void get_io_perms(void) +-{ +-} +- +-void release_io_perms(void) +-{ +-} +- -#else - -#error Unknown architecture @@ -141,6 +148,42 @@ index 8c89925..f10d957 100644 void mmio_writeb(uint8_t val, void *addr) { +diff --git a/hwaccess.h b/hwaccess.h +index 1e276ec..be3af34 100644 +--- a/hwaccess.h ++++ b/hwaccess.h +@@ -209,7 +209,7 @@ cpu_to_be(64) + #define off64_t off_t + #define lseek64 lseek + #endif +-#if defined (__sun) && (defined(__i386) || defined(__amd64)) ++#if defined (__sun) + /* Note different order for outb */ + #define OUTB(x,y) outb(y, x) + #define OUTW(x,y) outw(y, x) +@@ -329,22 +329,6 @@ int libpayload_wrmsr(int addr, msr_t msr); + #define wrmsr libpayload_wrmsr + #endif + +-#elif defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__) +- +-/* PCI port I/O is not yet implemented on PowerPC. */ +- +-#elif defined (__mips) || defined (__mips__) || defined (_mips) || defined (mips) +- +-/* PCI port I/O is not yet implemented on MIPS. */ +- +-#elif defined(__arm__) +- +-/* Non memory mapped I/O is not supported on ARM. */ +- +-#else +- +-#error Unknown architecture, please check if it supports PCI port IO. +- + #endif + #endif + -- -1.7.7.5 +1.7.9.3 diff --git a/flashrom-0006-Use-endiannes-determined-at-the-configure-stage.patch b/flashrom-0006-Use-endiannes-determined-at-the-configure-stage.patch index 5edc4fa..83b5d64 100644 --- a/flashrom-0006-Use-endiannes-determined-at-the-configure-stage.patch +++ b/flashrom-0006-Use-endiannes-determined-at-the-configure-stage.patch @@ -1,18 +1,18 @@ -From d15ca8999d1fa60cae0017adf6ff533726cb10b2 Mon Sep 17 00:00:00 2001 +From 29e2b7378e475195c59b400a04ca28036bf97d10 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov <lemenkov(a)gmail.com> Date: Sun, 26 Sep 2010 18:25:31 +0400 -Subject: [PATCH 06/10] Use endiannes determined at the configure stage +Subject: [PATCH 6/9] Use endiannes determined at the configure stage Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> --- - hwaccess.h | 53 ++--------------------------------------------------- - 1 files changed, 2 insertions(+), 51 deletions(-) + hwaccess.h | 60 ++---------------------------------------------------------- + 1 file changed, 2 insertions(+), 58 deletions(-) diff --git a/hwaccess.h b/hwaccess.h -index eea3652..5188a98 100644 +index be3af34..7d9b108 100644 --- a/hwaccess.h +++ b/hwaccess.h -@@ -41,51 +41,6 @@ +@@ -41,58 +41,6 @@ #undef index #endif @@ -43,6 +43,13 @@ index eea3652..5188a98 100644 -#error Little-endian PowerPC #defines are unknown -#endif - +-#elif defined (__arm__) +-#if defined (__ARMEL__) +-#define __FLASHROM_LITTLE_ENDIAN__ 1 +-#else +-#error Big-endian ARM #defines are unknown +-#endif +- -#endif - -#if !defined (__FLASHROM_BIG_ENDIAN__) && !defined (__FLASHROM_LITTLE_ENDIAN__) @@ -64,7 +71,7 @@ index eea3652..5188a98 100644 #define ___constant_swab8(x) ((uint8_t) ( \ (((uint8_t)(x) & (uint8_t)0xffU)))) -@@ -127,7 +82,7 @@ cpu_to_le(64) +@@ -134,7 +82,7 @@ cpu_to_le(64) #define cpu_to_be32 #define cpu_to_be64 @@ -73,7 +80,7 @@ index eea3652..5188a98 100644 #define cpu_to_be(bits) \ static inline uint##bits##_t cpu_to_be##bits(uint##bits##_t val) \ -@@ -145,11 +100,7 @@ cpu_to_be(64) +@@ -152,11 +100,7 @@ cpu_to_be(64) #define cpu_to_le32 #define cpu_to_le64 @@ -87,5 +94,5 @@ index eea3652..5188a98 100644 #define be_to_cpu8 cpu_to_be8 #define be_to_cpu16 cpu_to_be16 -- -1.7.7.5 +1.7.9.3 diff --git a/flashrom-0007-Use-HAVE_-_H-macro-for-detecting-includes.patch b/flashrom-0007-Use-HAVE_-_H-macro-for-detecting-includes.patch index efacfc8..c2bf253 100644 --- a/flashrom-0007-Use-HAVE_-_H-macro-for-detecting-includes.patch +++ b/flashrom-0007-Use-HAVE_-_H-macro-for-detecting-includes.patch @@ -1,15 +1,15 @@ -From c133e2af9a4b2d558303976fd02e85e186b2b9f4 Mon Sep 17 00:00:00 2001 +From 570a0f7e8ec62b5cf4fc65f2d8c30be1167db5e3 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov <lemenkov(a)gmail.com> Date: Sun, 26 Sep 2010 21:05:50 +0400 -Subject: [PATCH 07/10] Use HAVE_*_H macro for detecting includes +Subject: [PATCH 7/9] Use HAVE_*_H macro for detecting includes Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> --- - hwaccess.h | 70 ++++++++++++++++++++++++++++++++++++++++++----------------- - 1 files changed, 50 insertions(+), 20 deletions(-) + hwaccess.h | 77 ++++++++++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 54 insertions(+), 23 deletions(-) diff --git a/hwaccess.h b/hwaccess.h -index 5188a98..4560c17 100644 +index 7d9b108..96eee0e 100644 --- a/hwaccess.h +++ b/hwaccess.h @@ -24,11 +24,9 @@ @@ -26,11 +26,10 @@ index 5188a98..4560c17 100644 #if NEED_PCI == 1 /* -@@ -39,7 +37,47 @@ +@@ -39,7 +37,53 @@ #define index shadow_workaround_index #include <pci/pci.h> #undef index --#endif + +#if defined (HAVE_STRINGS_H) +#include <strings.h> @@ -49,7 +48,13 @@ index 5188a98..4560c17 100644 +#endif /* defined (HAVE_MACHINE_SYSARCH_H) */ + +#if defined (HAVE_MACHINE_CPUFUNC_H) ++#if defined(__FreeBSD__) || defined(__DragonFly__) ++ /* Note that Debian/kFreeBSD (FreeBSD kernel with glibc) has conflicting ++ * out[bwl] definitions in machine/cpufunc.h and sys/io.h at least in some ++ * versions. Use machine/cpufunc.h only for plain FreeBSD/DragonFlyBSD. ++ */ +#include <machine/cpufunc.h> + #endif +#endif /* defined (HAVE_MACHINE_CPUFUNC_H) */ + +/* for iopl and outb under Solaris */ @@ -75,7 +80,7 @@ index 5188a98..4560c17 100644 #define ___constant_swab8(x) ((uint8_t) ( \ (((uint8_t)(x) & (uint8_t)0xffU)))) -@@ -112,18 +150,13 @@ cpu_to_be(64) +@@ -112,18 +156,13 @@ cpu_to_be(64) #define le_to_cpu64 cpu_to_le64 #if NEED_PCI == 1 @@ -97,15 +102,19 @@ index 5188a98..4560c17 100644 #if (defined(__MACH__) && defined(__APPLE__)) #define __DARWIN__ #endif -@@ -133,7 +166,6 @@ cpu_to_be(64) +@@ -133,11 +172,6 @@ cpu_to_be(64) */ #if defined(__FreeBSD__) || defined(__DragonFly__) +- /* Note that Debian/kFreeBSD (FreeBSD kernel with glibc) has conflicting +- * out[bwl] definitions in machine/cpufunc.h and sys/io.h at least in some +- * versions. Use machine/cpufunc.h only for plain FreeBSD/DragonFlyBSD. +- */ - #include <machine/cpufunc.h> #define off64_t off_t #define lseek64 lseek #define OUTB(x, y) do { u_int outb_tmp = (y); outb(outb_tmp, (x)); } while (0) -@@ -161,8 +193,6 @@ cpu_to_be(64) +@@ -165,8 +199,6 @@ cpu_to_be(64) #ifdef __DJGPP__ @@ -114,7 +123,7 @@ index 5188a98..4560c17 100644 #define OUTB(x,y) outportb(y, x) #define OUTW(x,y) outportw(y, x) #define OUTL(x,y) outportl(y, x) -@@ -189,8 +219,6 @@ cpu_to_be(64) +@@ -193,8 +225,6 @@ cpu_to_be(64) #define off64_t off_t #define lseek64 lseek #if defined(__i386__) || defined(__x86_64__) @@ -123,17 +132,16 @@ index 5188a98..4560c17 100644 #if defined(__NetBSD__) #if defined(__i386__) #define iopl i386_iopl -@@ -247,7 +275,8 @@ static inline uint32_t inl(uint16_t port) +@@ -251,7 +281,7 @@ static inline uint32_t inl(uint16_t port) typedef struct { uint32_t hi, lo; } msr_t; msr_t rdmsr(int addr); int wrmsr(int addr, msr_t msr); -#endif -+#endif /* !defined(__DARWIN__) && !defined(__FreeBSD__) && !defined(__DragonFly__) */ -+ - #if defined(__FreeBSD__) || defined(__DragonFly__) ++#endif /* !defined(__DARWIN__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__DragonFly__) && !defined(__LIBPAYLOAD__) */ + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) /* FreeBSD already has conflicting definitions for wrmsr/rdmsr. */ #undef rdmsr -@@ -257,7 +286,8 @@ int wrmsr(int addr, msr_t msr); +@@ -261,7 +291,8 @@ int wrmsr(int addr, msr_t msr); typedef struct { uint32_t hi, lo; } msr_t; msr_t freebsd_rdmsr(int addr); int freebsd_wrmsr(int addr, msr_t msr); @@ -144,5 +152,5 @@ index 5188a98..4560c17 100644 #include <arch/io.h> #include <arch/msr.h> -- -1.7.7.5 +1.7.9.3 diff --git a/flashrom-0009-ppc-hack.patch b/flashrom-0008-ppc-hack.patch similarity index 82% rename from flashrom-0009-ppc-hack.patch rename to flashrom-0008-ppc-hack.patch index 7f97620..bd44014 100644 --- a/flashrom-0009-ppc-hack.patch +++ b/flashrom-0008-ppc-hack.patch @@ -1,15 +1,15 @@ -From afa660c6abea4f1c5b0df5bd35b95dadc681108b Mon Sep 17 00:00:00 2001 +From f5b9fc324c31c765e3fa7fb5a0f3d61130c65ef3 Mon Sep 17 00:00:00 2001 From: Mattias Mattsson <vitplister(a)gmail.com> Date: Wed, 27 Jul 2011 21:02:50 +0400 -Subject: [PATCH 09/10] ppc hack +Subject: [PATCH 8/9] ppc hack --- internal.c | 2 ++ processor_enable.c | 2 +- - 2 files changed, 3 insertions(+), 1 deletions(-) + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/internal.c b/internal.c -index 5716e64..1233cae 100644 +index 479cbf7..2fb7c83 100644 --- a/internal.c +++ b/internal.c @@ -334,6 +334,8 @@ int internal_init(void) @@ -35,5 +35,5 @@ index d680f97..014e019 100644 int processor_flash_enable(void) { -- -1.7.7.5 +1.7.9.3 diff --git a/flashrom-0010-Simplify-processor.h.patch b/flashrom-0009-Simplify-processor.h.patch similarity index 90% rename from flashrom-0010-Simplify-processor.h.patch rename to flashrom-0009-Simplify-processor.h.patch index 30fde70..110ff4d 100644 --- a/flashrom-0010-Simplify-processor.h.patch +++ b/flashrom-0009-Simplify-processor.h.patch @@ -1,12 +1,12 @@ -From eb00fe31da8571f16ae87f981a30fed1c89dc15a Mon Sep 17 00:00:00 2001 +From 489274cbff3c17b88a7de990425a0c365609d2ff Mon Sep 17 00:00:00 2001 From: Peter Lemenkov <lemenkov(a)gmail.com> Date: Thu, 28 Jul 2011 12:56:17 +0400 -Subject: [PATCH 10/10] Simplify processor.h +Subject: [PATCH 9/9] Simplify processor.h Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> --- processor_enable.c | 26 +++++++++----------------- - 1 files changed, 9 insertions(+), 17 deletions(-) + 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/processor_enable.c b/processor_enable.c index 014e019..bf69330 100644 @@ -58,5 +58,5 @@ index 014e019..bf69330 100644 - -#endif -- -1.7.7.5 +1.7.9.3 diff --git a/flashrom.spec b/flashrom.spec index 84f4a50..6883b60 100644 --- a/flashrom.spec +++ b/flashrom.spec @@ -1,14 +1,14 @@ Summary: Simple program for reading/writing BIOS chips content Name: flashrom -Version: 0.9.4 -Release: 4.svn1487%{?dist} +Version: 0.9.5.2 +Release: 1.svn1517%{?dist} License: GPLv2 Group: Applications/System URL:
http://flashrom.org
#Source0:
http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2
#Source1:
http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2.asc
-## svn -r 1487 export
svn://coreboot.org/flashrom/trunk
flashrom-0.9.4 -## tar -cjvf flashrom-0.9.4.tar.bz2 flashrom-0.9.4 +## svn -r 1517 export
svn://coreboot.org/flashrom/trunk
flashrom-0.9.5.2 +## tar -cjvf flashrom-0.9.5.2.tar.bz2 flashrom-0.9.5.2 Source0: %{name}-%{version}.tar.bz2 Patch1: flashrom-0001-Initial-commit-of-autotools-related-files.patch Patch2: flashrom-0002-Use-dmidecode-path-defined-at-configure-stage.patch @@ -17,9 +17,8 @@ Patch4: flashrom-0004-Kill-some-x86-related-ifdefs-in-code-this-is-now-con.patc Patch5: flashrom-0005-Simplify-hwaccess.c.patch Patch6: flashrom-0006-Use-endiannes-determined-at-the-configure-stage.patch Patch7: flashrom-0007-Use-HAVE_-_H-macro-for-detecting-includes.patch -Patch8: flashrom-0008-Move-arch-checking-ifdef-block-into-header.patch -Patch9: flashrom-0009-ppc-hack.patch -Patch10: flashrom-0010-Simplify-processor.h.patch +Patch8: flashrom-0008-ppc-hack.patch +Patch9: flashrom-0009-Simplify-processor.h.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: pciutils-devel @@ -48,7 +47,6 @@ and write new contents on the chips ("flash the chip"). %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 %build @@ -71,6 +69,15 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/%{name}.* %changelog +* Sat Mar 31 2012 Peter Lemenkov <lemenkov(a)gmail.com> - 0.9.5.2-1.svn1517 +- Updated to latest svn ver. 1517 (post-release snapshot for 0.9.5.2) +- Add (untested) board enable for ASUS TUSL2-C +- Add board enable for ASUS OPLX-M. +- Add support for SFDP (JESD216) +- Support compilation for the ARM architecture (not enabled in the spec-file) +- Board enable for TriGem Anaheim-3 +- Add support for RDC R6030 chipset + * Thu Feb 02 2012 Peter Lemenkov <lemenkov(a)gmail.com> - 0.9.4-4.svn1487 - Updated to latest svn ver. 1487 (post-release snapshot for 0.9.4) - Add board enable for the MSC Q7 Tunnel Creek board diff --git a/sources b/sources index 77cf72b..39b1de0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e56266c885c895bd10298867fc18194b flashrom-0.9.4.tar.bz2 +543860dfd4f17c211a304ed4026b1591 flashrom-0.9.5.2.tar.bz2
1
0
0
0
File flashrom-0.9.5.2.tar.bz2 uploaded to lookaside cache by peter
by Peter Lemenkov
31 Mar '12
31 Mar '12
A file has been added to the lookaside cache for flashrom: 543860dfd4f17c211a304ed4026b1591 flashrom-0.9.5.2.tar.bz2
1
0
0
0
[flac/f16] do an f16 build (16 still has the .fc12 build!)
by Adam Williamson
31 Mar '12
31 Mar '12
commit f66f050be1f0afc117485f1a592fae396b32df2e Author: Adam Williamson <awilliam(a)redhat.com> Date: Sat Mar 31 10:05:20 2012 -0700 do an f16 build (16 still has the .fc12 build!) flac.spec | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) --- diff --git a/flac.spec b/flac.spec index fc61e7b..f9bc5c3 100644 --- a/flac.spec +++ b/flac.spec @@ -1,7 +1,7 @@ Summary: An encoder/decoder for the Free Lossless Audio Codec Name: flac Version: 1.2.1 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD and GPLv2+ Group: Applications/Multimedia Source:
http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
@@ -91,6 +91,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/*.m4 %changelog +* Sat Mar 31 2012 Adam Williamson <awilliam(a)redhat.com> - 1.2.1-8.fc16 +- rebuild for f16 (there are 'modern' builds for 15 and 17 but no 16) + * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.1-7 - Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
1
0
0
0
[python-tgcaptcha2/el6] First import
by Pierre-YvesChibon
31 Mar '12
31 Mar '12
Summary of changes: f152bca... First import (*) (*) This commit already existed in another branch; no separate mail sent
1
0
0
0
[python-tgcaptcha2] First import
by Pierre-YvesChibon
31 Mar '12
31 Mar '12
commit f152bca2e53740639d97face0c91b04fbc454593 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Sat Mar 31 18:50:02 2012 +0200 First import .gitignore | 1 + python-tgcaptcha2.spec | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 62 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..1a68a2c 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/TGCaptcha2-0.2.0.tar.gz diff --git a/python-tgcaptcha2.spec b/python-tgcaptcha2.spec new file mode 100644 index 0000000..959f439 --- /dev/null +++ b/python-tgcaptcha2.spec @@ -0,0 +1,60 @@ +Name: python-tgcaptcha2 +Version: 0.2.0 +Release: 2%{?dist} +Summary: TurboGears captcha plugin + +Group: Development/Languages +License: MIT +URL:
https://fedorahosted.org/tgcaptcha2/
+Source0:
https://fedorahosted.org/releases/t/g/tgcaptcha2/TGCaptcha2-%{version}.tar.…
+ +BuildArch: noarch +BuildRequires: python-devel TurboGears +BuildRequires: python-setuptools + +Requires: TurboGears +Requires: espeak +Requires: python-fedora-turbogears + +%description +TGCaptcha2 is a TurboGears widget that provides an easy way to +incorporate a captcha as part a form in an attempt to reduce spam or +malicious activity. + +Features include: + + * (Relatively) pain-free usage and validation inside of a regular + widget-based form + * Flexibility to add or extend image generation algorithms and the + text displayed in the image + +Enhanced with: + + * Embed a word in the image or an equation that the user has to + solve + * Add an audio captch + +%prep +%setup -q -n TGCaptcha2-%{version} + +sed -i -e "s|from setuptools|__requires__ = ['TurboJson >= 1.3']\nfrom setuptools|" setup.py + +%build +%{__python} setup.py build + +%install +%{__python} setup.py install --skip-build --root %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc README.txt CONTRIBUTORS.txt CHANGELOG.txt COPYRIGHT.txt +%{python_sitelib}/*.egg-info +%{python_sitelib}/tgcaptcha2/ + +%changelog +* Tue Mar 01 2012 Pierre-Yves Chibon <pingou(a)pingoured.fr> - 0.2.0-2 +- Clean spec + +* Tue Feb 14 2012 Pierre-Yves Chibon <pingou(a)pingoured.fr> - 0.2.0-1 +- Initial RPM Package. diff --git a/sources b/sources index e69de29..45e7b87 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +0b85973197459e2ed530a093ed27afca TGCaptcha2-0.2.0.tar.gz
1
0
0
0
File TGCaptcha2-0.2.0.tar.gz uploaded to lookaside cache by pingou
by Pierre-YvesChibon
31 Mar '12
31 Mar '12
A file has been added to the lookaside cache for python-tgcaptcha2: 0b85973197459e2ed530a093ed27afca TGCaptcha2-0.2.0.tar.gz
1
0
0
0
[turpial/f17] Here a new stable release to turpial.
by Edwind Richzendy Contreras Soto
31 Mar '12
31 Mar '12
commit 1815b6b7c3132dc640e7dd17f34bbab5b055c75a Author: Edwind Contreras <Richzendy(a)gmail.com> Date: Sat Mar 31 10:41:45 2012 -0600 Here a new stable release to turpial. .gitignore | 1 + sources | 2 +- turpial.spec | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) --- diff --git a/.gitignore b/.gitignore index 53b000c..90d9ba4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /turpial-1.5.0.tar.gz /turpial.1.gz /turpial-1.6.6.tar.gz +/turpial-1.6.9.tar.gz diff --git a/sources b/sources index 81c1405..1438379 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1932f4b8def722e3bd28b156c442ce44 turpial-1.6.6.tar.gz +83303f5781d3f33b79d42d35a898f954 turpial-1.6.9.tar.gz ddd50be8b951f93390243d02cc3226d4 turpial.1.gz diff --git a/turpial.spec b/turpial.spec index 71ce921..38c3348 100644 --- a/turpial.spec +++ b/turpial.spec @@ -5,14 +5,14 @@ %endif Name: turpial -Version: 1.6.6 -Release: 4%{?dist} +Version: 1.6.9 +Release: 1%{?dist} Summary: Cool twitter client with many features and very light Group: Applications/Internet License: GPLv3 URL:
http://turpial.org.ve
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0:
http://turpial.org.ve/files/sources/stable/turpial-%{version}.tar.gz
+Source0:
http://files.turpial.org.ve/sources/stable/turpial-%{version}.tar.gz
Source1: %{name}.1.gz BuildRequires: python-babel, python2-devel, python-setuptools Requires: python-setuptools, python-simplejson, notify-python, pygtk2, pywebkitgtk, gnome-python2-gtkspell,gstreamer-python,pywebkitgtk @@ -52,8 +52,8 @@ rm -rf %{buildroot} %{_mandir}/man1/%{name}.1.gz %changelog -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6.6-4 -- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Thu Mar 22 2012 Richzendy <richzendy(a)fedoraproject.org> - 1.6.9-1 +- New stable release, url to source code updated * Fri Dec 02 2011 Richzendy <richzendy(a)fedoraproject.org> - 1.6.6-3 - Fix to bug 758979, 758992 in bugzilla
1
0
0
0
[recoll/f17] 1.17.1
by terjeros
31 Mar '12
31 Mar '12
Summary of changes: 0353613... 1.17.1 (*) (*) This commit already existed in another branch; no separate mail sent
1
0
0
0
[recoll/f16] (3 commits) ...1.17.1
by terjeros
31 Mar '12
31 Mar '12
Summary of changes: 56f6d52... Add patch to build with gcc 4.7 (*) 7bc395d... - Rebuilt for c++ ABI breakage (*) 0353613... 1.17.1 (*) (*) This commit already existed in another branch; no separate mail sent
1
0
0
0
[turpial] Here a new stable release to turpial.
by Edwind Richzendy Contreras Soto
31 Mar '12
31 Mar '12
commit 490ffcf17ae63526cd9bb41bfd4d0fd3d3f6ffd6 Author: Edwind Contreras <Richzendy(a)gmail.com> Date: Sat Mar 31 10:34:53 2012 -0600 Here a new stable release to turpial. turpial.spec | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) --- diff --git a/turpial.spec b/turpial.spec index 1393947..38c3348 100644 --- a/turpial.spec +++ b/turpial.spec @@ -5,13 +5,8 @@ %endif Name: turpial -<<<<<<< HEAD Version: 1.6.9 Release: 1%{?dist} -======= -Version: 1.6.6 -Release: 4%{?dist} ->>>>>>> 3f2d4848ae7f215707054d7abd2582be65139c23 Summary: Cool twitter client with many features and very light Group: Applications/Internet License: GPLv3 @@ -57,13 +52,8 @@ rm -rf %{buildroot} %{_mandir}/man1/%{name}.1.gz %changelog -<<<<<<< HEAD * Thu Mar 22 2012 Richzendy <richzendy(a)fedoraproject.org> - 1.6.9-1 - New stable release, url to source code updated -======= -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6.6-4 -- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
->>>>>>> 3f2d4848ae7f215707054d7abd2582be65139c23 * Fri Dec 02 2011 Richzendy <richzendy(a)fedoraproject.org> - 1.6.6-3 - Fix to bug 758979, 758992 in bugzilla
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
9
...
1963
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
Results per page:
10
25
50
100
200