cygwin 1.7.8-1

6 files changed, 6 insertions, 216 deletions

diff --git a/cygwin-1.7.7-cfgetiospeed.patch b/cygwin-1.7.7-cfgetiospeed.patch
deleted file mode 100644
index 6c05ccf..0000000
--- a/cygwin-1.7.7-cfgetiospeed.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/winsup/cygwin/include/sys/termios.h	2009-06-08 10:30:54.000000000 -0500
-+++ b/winsup/cygwin/include/sys/termios.h	2011-02-15 09:56:03.000000000 -0600
-@@ -317,9 +317,6 @@
- 
- #define termio termios
- 
--#define cfgetospeed(tp)		((tp)->c_ospeed)
--#define cfgetispeed(tp)		((tp)->c_ispeed)
--
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -331,6 +328,8 @@
- int tcflush (int, int);
- int tcflow (int, int);
- void cfmakeraw (struct termios *);
-+speed_t cfgetispeed(const struct termios *);
-+speed_t cfgetospeed(const struct termios *);
- int cfsetispeed (struct termios *, speed_t);
- int cfsetospeed (struct termios *, speed_t);
- 
-@@ -338,6 +337,11 @@
- }
- #endif
- 
-+#ifndef __cplusplus
-+#define cfgetispeed(tp)		((tp)->c_ispeed)
-+#define cfgetospeed(tp)		((tp)->c_ospeed)
-+#endif
-+
- /* Extra stuff to make porting stuff easier.  */
- struct winsize
- {
---- a/winsup/cygwin/termios.cc	2009-08-10 08:57:13.000000000 -0500
-+++ b/winsup/cygwin/termios.cc	2011-02-15 09:56:02.000000000 -0600
-@@ -232,14 +233,14 @@
- 
- /* cfgetospeed: POSIX96 7.1.3.1 */
- extern "C" speed_t
--cfgetospeed (struct termios *tp)
-+cfgetospeed (const struct termios *tp)
- {
-   return __tonew_termios (tp)->c_ospeed;
- }
- 
- /* cfgetispeed: POSIX96 7.1.3.1 */
- extern "C" speed_t
--cfgetispeed (struct termios *tp)
-+cfgetispeed (const struct termios *tp)
- {
-   return __tonew_termios (tp)->c_ispeed;
- }
diff --git a/cygwin-1.7.7-cross-configure.patch b/cygwin-1.7.7-cross-configure.patch
deleted file mode 100644
index 28fcabf..0000000
--- a/cygwin-1.7.7-cross-configure.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- a/winsup/configure.in	2009-01-27 09:25:00.000000000 -0600
-+++ b/winsup/configure.in	2011-02-17 01:08:15.910147700 -0600
-@@ -45,7 +45,7 @@
- if test -d $srcdir/mingw; then
-   AC_CONFIG_SUBDIRS(mingw)
- fi
--AC_CONFIG_SUBDIRS(w32api)
-+AC_CONFIG_SUBDIRS(w32api cygserver)
- 
- case "$with_cross_host" in
-   ""|*cygwin*)
-@@ -58,7 +58,7 @@
-     if test -d $srcdir/lsaauth; then
-       AC_CONFIG_SUBDIRS(lsaauth)
-     fi
--    AC_CONFIG_SUBDIRS(cygserver utils doc)
-+    AC_CONFIG_SUBDIRS(utils doc)
-     ;;
- esac
- 
---- a/winsup/cygwin/configure.in	2009-01-27 09:25:00.000000000 -0600
-+++ b/winsup/cygwin/configure.in	2011-02-15 09:56:00.000000000 -0600
-@@ -25,15 +25,15 @@
-   ""|*cygwin*)
-     all_host="all_host"
-     install_host="install_host"
--    LIBSERVER='$(bupdir)/cygserver/libcygserver.a'
-     ;;
-   *)
-     all_host=
-     install_host=
--    LIBSERVER=
-     ;;
- esac
- 
-+LIBSERVER='$(bupdir)/cygserver/libcygserver.a'
-+
- AC_SUBST(all_host)
- AC_SUBST(install_host)
- 
-@@ -48,26 +48,8 @@
- AC_CHECK_TOOL(STRIP, strip, strip)
- AC_CHECK_TOOL(WINDRES, windres, windres)
- 
--AC_ALLOCA
- AC_PROG_MAKE_SET
- 
--dnl check whether gcc supports __builtin_memset.
--# Test for builtin mem* functions.
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--AC_TRY_COMPILE([
--#include <string.h>
--void foo(char *s, int c, size_t n)
--{
--  __builtin_memset(s, c, n);
--}
--], [ ],
--use_builtin_memset=yes, use_builtin_memset=no)
--if test $use_builtin_memset = "yes"; then
--  AC_DEFINE(HAVE_BUILTIN_MEMSET)
--fi
--AC_LANG_RESTORE
--
- AC_ARG_ENABLE(debugging,
- [ --enable-debugging		Build a cygwin DLL which has more consistency checking for debugging],
- [case "${enableval}" in
-diff -urN -x 'ChangeLog*' -x CVS a/winsup/cygserver/configure.in b/winsup/cygserver/configure.in
---- a/winsup/cygserver/configure.in	2006-05-24 11:59:02.000000000 -0500
-+++ b/winsup/cygserver/configure.in	2011-02-07 10:22:02.000000000 -0600
-@@ -44,26 +44,8 @@
- AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
- AC_CHECK_TOOL(WINDRES, windres, windres)
- 
--AC_ALLOCA
- AC_PROG_MAKE_SET
- 
--dnl check whether gcc supports __builtin_memset.
--# Test for builtin mem* functions.
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--AC_TRY_COMPILE([
--#include <string.h>
--void foo(char *s, int c, size_t n)
--{
--  __builtin_memset(s, c, n);
--}
--], [ ],
--use_builtin_memset=yes, use_builtin_memset=no)
--if test $use_builtin_memset = "yes"; then
--  AC_DEFINE(HAVE_BUILTIN_MEMSET)
--fi
--AC_LANG_RESTORE
--
- AC_ARG_ENABLE(debugging,
- [ --enable-debugging		Build a cygwin DLL which has more consistency checking for debugging],
- [case "${enableval}" in
diff --git a/cygwin-1.7.7-err-noreturn.patch b/cygwin-1.7.7-err-noreturn.patch
deleted file mode 100644
index f9b5948..0000000
--- a/cygwin-1.7.7-err-noreturn.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/winsup/cygwin/include/err.h	2003-11-06 15:31:24.000000000 -0600
-+++ b/winsup/cygwin/include/err.h	2011-02-02 09:14:46.000000000 -0600
-@@ -19,14 +19,14 @@
- extern void warn (const char *fmt, ...);
- extern void warnx (const char *fmt, ...);
- 
--extern void err (int eval, const char *fmt, ...);
--extern void errx (int eval, const char *fmt, ...);
-+extern void err (int eval, const char *fmt, ...) __attribute__ ((__noreturn__));
-+extern void errx (int eval, const char *fmt, ...) __attribute__ ((__noreturn__));
- 
- extern void vwarn (const char *fmt, va_list ap);
- extern void vwarnx (const char *fmt, va_list ap);
- 
--extern void verr (int eval, const char *fmt, va_list ap);
--extern void verrx (int eval, const char *fmt, va_list ap);
-+extern void verr (int eval, const char *fmt, va_list ap) __attribute__ ((__noreturn__));
-+extern void verrx (int eval, const char *fmt, va_list ap) __attribute__ ((__noreturn__));
- 
- __END_DECLS
- 
diff --git a/cygwin-1.7.7-path-vartmp.patch b/cygwin-1.7.7-path-vartmp.patch
deleted file mode 100644
index e626d6b..0000000
--- a/cygwin-1.7.7-path-vartmp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/winsup/cygwin/include/paths.h	2010-03-18 09:57:10.000000000 -0500
-+++ b/winsup/cygwin/include/paths.h	2010-11-02 12:38:36.000000000 -0500
-@@ -26,6 +26,7 @@
- #define _PATH_TTY	"/dev/tty"
- #define _PATH_UTMP	"/var/run/utmp"
- #define _PATH_VARRUN	"/var/run/"
-+#define _PATH_VARTMP	"/var/tmp/"
- #define _PATH_VI        "/bin/vi"
- #define _PATH_WTMP	"/var/log/wtmp"
- 
diff --git a/cygwin-1.7.7-pthread_yield.patch b/cygwin-1.7.7-pthread_yield.patch
deleted file mode 100644
index d1ae022..0000000
--- a/cygwin-1.7.7-pthread_yield.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/winsup/cygwin/include/pthread.h	2007-02-07 11:22:40.000000000 -0600
-+++ b/winsup/cygwin/include/pthread.h	2011-02-15 09:56:02.000000000 -0600
-@@ -194,6 +194,7 @@
- 
- int pthread_suspend (pthread_t);
- int pthread_continue (pthread_t);
-+#define pthread_yield sched_yield
- 
- #ifdef __cplusplus
- }
diff --git a/cygwin.spec b/cygwin.spec
index be626de..aced7ad 100644
--- a/cygwin.spec
+++ b/cygwin.spec
@@ -5,25 +5,17 @@
 %define __find_provides %{_cygwin_findprovides}
 
 Name:           cygwin
-Version:        1.7.7
+Version:        1.7.8
 Release:        1%{?dist}
 Summary:        Cygwin cross-compiler runtime
 
 License:        GPLv2 with exceptions
 Group:          Development/Libraries
 URL:            http://www.cygwin.com/
-Source0:        ftp:/sourceware.org/pub/cygwin/release/cygwin/cygwin-%{version}-1-src.tar.bz2
+Source0:        ftp://sourceware.org/pub/cygwin/release/cygwin/cygwin-%{version}-1-src.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-# Remove all of these for 1.7.8
-Patch0:         cygwin-1.7.7-cross-configure.patch
-Patch1:         cygwin-1.7.7-cfgetiospeed.patch
-Patch2:         cygwin-1.7.7-err-noreturn.patch
-Patch3:         cygwin-1.7.7-path-vartmp.patch
-Patch4:         cygwin-1.7.7-pthread_yield.patch
-
-
 BuildRequires:  cygwin-filesystem >= 2
 BuildRequires:  cygwin-binutils
 BuildRequires:  cygwin-gcc
@@ -40,21 +32,6 @@ Cygwin cross-compiler runtime, base libraries.
 
 %prep
 %setup -q -n cygwin-%{version}-1
-%patch0 -p1 -b .crossconfig~
-%patch1 -p1 -b .termios~
-%patch2 -p1 -b .err~
-%patch3 -p1 -b .paths~
-%patch4 -p1 -b .pthread~
-
-pushd winsup
-autoconf -f
-popd
-pushd winsup/cygwin
-autoconf -f
-popd
-pushd winsup/cygserver
-autoconf -f
-popd
 
 # code still has some warnings with gcc4.5
 sed -i -e 's| -Werror | |' winsup/cygwin/Makefile.in
@@ -106,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc winsup/COPYING winsup/CYGWIN_LICENSE
 %{_cygwin_bindir}/cygwin1.dll
 %{_cygwin_includedir}/*
@@ -114,5 +91,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 01 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1.7.8-1
+- Version bump.
+
 * Wed Feb 16 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1.7.7-1
 - Initial RPM release, largely based on earlier work from several sources.