Browse Source

commitを間違ったのでrevert

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10955 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 7 years ago
parent
commit
e798f8143b

+ 1 - 5
f/filesystem/filesystem-vl.spec

@@ -2,12 +2,11 @@ Summary: The basic directory layout for a Linux system.
 Summary(ja): Linux システム用の基本ディレクトリ配置
 Name: filesystem
 Version: 2.6
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 License: Public Domain
 Group: System Environment/Base
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildArchitectures: noarch
-Requires: setup
 
 %description
 The filesystem package is one of the basic packages that is installed on
@@ -110,9 +109,6 @@ rm -rf $RPM_BUILD_ROOT
 /var/state/misc
 
 %changelog
-* Wed Dec 16 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6-2
-- added R:setup.
-
 * Tue Sep 25 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6-1
 - remove /var/lib/rpm , add /var/lib/rpm-state
 - add /run

+ 2 - 13
g/gd/gd-vl.spec

@@ -4,12 +4,10 @@
 Summary: A graphics library for drawing .png files.
 Summary(ja): PNGイメージファイルを描写するためのグラフィックライブラリ
 Name: gd
-Version: 2.2.4
+Version: 2.2.1
 Release: 1%{_dist_release}
 Source0: https://bitbucket.org/libgd/gd-libgd/downloads/libgd-%{version}.tar.xz
 Patch0: gd-2.1.0-multilib.patch
-Patch1: issue357.patch
-Patch2: issue364.patch
 License: BSD-style
 URL: http://www.libgd.org/
 Group: System Environment/Libraries
@@ -28,8 +26,6 @@ BuildRequires: libX11-devel
 BuildRequires: libXpm-devel
 BuildRequires: zlib-devel
 BuildRequires: pkgconfig
-# for test
-BuildRequires: TrueType-vlgothic
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -147,8 +143,6 @@ If you're installing the gd graphics library, you must install gd-devel.
 %prep
 %setup -q -n libgd-%{version}
 %patch0 -p1 -b .mlib
-%patch1 -p1 -b .issue357
-%patch2 -p1 -b .issue364
 
 : regenerate autotool stuff
 if [ -f configure ]; then
@@ -189,9 +183,8 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
 %check
-%ifarch x86_64
+
 make %{?_smp_mflags} check
-%endif
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
@@ -231,10 +224,6 @@ make %{?_smp_mflags} check
 %endif
 
 %changelog
-* Sun Mar 19 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.4-1
-- new upstream release.
-- made to skip %%check on i686.
-
 * Wed May 25 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.1-1
 - new upstream release.
 - removed Patch1000 (fixed in upstream).

+ 2 - 9
i/ipsec-tools/ipsec-tools-vl.spec

@@ -1,12 +1,8 @@
 %bcond_with wildcard_psk
 
-%if %{with wildcard_psk}
-%define rel_wildcard_psk _wildcard
-%endif
-
 Name: ipsec-tools
-Version: 0.8.2
-Release: 1%{?_dist_release}%{?rel_wildcard_psk}
+Version: 0.8.1
+Release: 1%{?_dist_release}
 Summary: Tools for configuring and using IPsec
 Summary(ja): IPsecツール
 License: BSD
@@ -175,9 +171,6 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/racoon
 
 %changelog
-* Wed Apr 2 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8.2-1
-- new upstream release.
-
 * Tue Dec 10 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8.1-1
 - new upstream release.
 

+ 75 - 39
j/jasper/jasper-vl.spec

@@ -1,18 +1,52 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
-%define _unpackaged_files_terminate_build 1
 
 Name:        jasper
 Summary:     implementation of the JPEG-2000 standard, Part 1
-Version:     2.0.12
-Release:     1%{?_dist_release}
+Version:     1.900.1
+Release:     11%{?_dist_release}
 
 Group:       Applications/Graphics
 License:     Modified BSD (see LICENSE)
 URL:         http://www.ece.uvic.ca/~mdadams/jasper/
 
-Source:      %{name}-version-%{version}.tar.gz
-
-Patch1: jasper-1.900.1-CVE-2008-3520.patch
+Source:      %{name}-%{version}.zip
+
+Patch1: jasper-1.701.0-GL.patch
+# autoconf/automake bits of patch1
+Patch2: jasper-1.701.0-GL-ac.patch
+# CVE-2007-2721 (bug #240397)
+# borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=413041;msg=88
+Patch3: patch-libjasper-stepsizes-overflow.diff
+# borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786
+Patch4: jpc_dec.c.patch
+# OpenBSD hardening patches addressing couple of possible integer overflows
+# during the memory allocations
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520
+Patch5: jasper-1.900.1-CVE-2008-3520.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522
+Patch6: jasper-1.900.1-CVE-2008-3522.patch
+# add pkg-config support
+Patch7: jasper-pkgconfig.patch
+
+Patch8: jasper-1.900.1-CVE-2011-4516-CVE-2011-4517-CERT-VU-887409.patch
+
+Patch9: jasper-CVE-2014-9029.patch
+Patch10: jasper-CVE-2014-8137.patch
+Patch11: jasper-CVE-2014-8138.patch
+
+# Issues found by static analysis of code
+Patch110: jasper-1.900.1-Coverity-BAD_SIZEOF.patch
+Patch111: jasper-1.900.1-Coverity-CHECKED_RETURN.patch
+Patch112: jasper-1.900.1-Coverity-FORWARD_NULL.patch
+Patch113: jasper-1.900.1-Coverity-NULL_RETURNS.patch
+Patch114: jasper-1.900.1-Coverity-RESOURCE_LEAK.patch
+Patch115: jasper-1.900.1-Coverity-UNREACHABLE.patch
+Patch116: jasper-1.900.1-Coverity-UNUSED_VALUE.patch
+
+# from debian
+Patch1000: 09-CVE-2016-1577.patch
+Patch1001: 10-CVE-2016-2089.patch
+Patch1002: 11-CVE-2016-2116.patch
 
 BuildRoot:   %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf automake libtool
@@ -20,7 +54,6 @@ BuildRequires: freeglut-devel
 BuildRequires: libGLU-devel
 BuildRequires: libjpeg-devel
 BuildRequires: pkgconfig
-BuildRequires: cmake
 
 Requires:    %{name}-libs = %{version}-%{release}
 
@@ -70,41 +103,49 @@ This package contains runtime libraries for JasPer.
 
 
 %prep
-%setup -q -n %{name}-version-%{version}
-
-%patch1 -p1 -b .CVE-2008-3520
+%setup -q -n %{name}-%{version}
+
+%patch1 -p1 -b .GL
+%patch2 -p1 -b .GL-ac
+%patch3 -p1 -b .CVE-2007-2721
+%patch4 -p1 -b .jpc_dec_assertion
+%patch5 -p1 -b .CVE-2008-3520
+%patch6 -p1 -b .CVE-2008-3522
+%patch7 -p1 -b .pkgconfig
+%patch8 -p1 -b .CVE-2011-4516-4517
+%patch9 -p1 -b .CVE-2014-9029
+%patch10 -p1 -b .CVE-2014-8137-variant2
+%patch11 -p1 -b .CVE-2014-8138
+
+%patch110 -p1 -b .BAD_SIZEOF
+%patch111 -p1 -b .CHECKED_RETURN
+%patch112 -p1 -b .FORWARD_NULL
+%patch113 -p1 -b .NULL_RETURNS
+%patch114 -p1 -b .RESOURCE_LEAK
+%patch115 -p1 -b .UNREACHABLE
+%patch116 -p1 -b .UNUSED_VALUE
+
+%patch1000 -p1 -b .CVE-2016-1577
+%patch1001 -p1 -b .CVE-2016-2089
+%patch1002 -p1 -b .CVE-2016-2116
+
+autoreconf --verbose --force --install
 
 %build
-mkdir -p builder
+CFLAGS="%{optflags} -fno-strict-overflow" \
+%configure --enable-shared --disable-static
 
-%cmake -G "Unix Makefiles" \
-       -H%{_builddir}/%{name}-version-%{version} \
-       -B%{_builddir}/%{name}-version-%{version}/builder
-
-pushd builder
-make %{?_smp_mflags} clean all
-popd
+make %{?_smp_mflags}
 
 %install
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
-pushd builder
-make install DESTDIR=%{buildroot}
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # remove .la
-rm -f %{buildroot}/%{_libdir}/*.la
-
-popd
-
-rm -rf %{buildroot}%{_docdir}/JasPer
-
-%check
-pushd builder
-LD_PRELOAD=`pwd`/src/libjasper/libjasper.so \
-make test
-popd
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %clean
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %post libs -p /sbin/ldconfig
 
@@ -118,7 +159,7 @@ popd
 %defattr(-,root,root)
 %{!?_licensedir:%global license %%doc}
 %license COPYRIGHT LICENSE
-%doc INSTALL README doc/README doc/jasper.pdf doc/jpeg2000.pdf
+%doc ChangeLog INSTALL NEWS README doc
 %{_bindir}/*
 %{_mandir}/man1/*
 
@@ -145,11 +186,6 @@ popd
 %endif
 
 %changelog
-* Mon Mar 20 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.12-1
-- new upstream release.
-- dropped all patches.
-- imported patch1 from rawhide.
-
 * Tue Jul 19 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.900.1-11
 - added Patch1000-1002 to fix CVE-2016-{1577,2089,2116}.
 

+ 26 - 6
lib/libt/libtiff/libtiff-vl.spec

@@ -3,12 +3,24 @@
 Summary: A library of functions for manipulating TIFF format image files.
 Summary(ja): TIFF フォーマットの画像ファイルを扱うライブラリ
 Name: libtiff
-Version: 4.0.7
-Release: 1%{_dist_release}
+Version: 4.0.3
+Release: 2%{_dist_release}
 License: distributable
 Group: System Environment/Libraries
 Source0: http://download.osgeo.org/libtiff/tiff-%{version}.tar.gz
 
+Patch1: libtiff-CVE-2012-4447.patch
+Patch2: libtiff-CVE-2012-4564.patch
+Patch3: libtiff-printdir-width.patch
+Patch4: libtiff-jpeg-test.patch
+Patch5: libtiff-CVE-2013-1960.patch
+Patch6: libtiff-CVE-2013-1961.patch
+Patch7: libtiff-manpage-update.patch
+Patch8: libtiff-CVE-2013-4231.patch
+Patch9: libtiff-CVE-2013-4232.patch
+Patch10: libtiff-CVE-2013-4244.patch
+Patch11: libtiff-make-check.patch
+
 URL: http://www.remotesensing.org/libtiff/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel libjpeg-devel
@@ -103,6 +115,18 @@ install the libtiff package.
 %prep
 %setup -q -n tiff-%{version}
 
+%patch1 -p1 -b .CVE-2012-4447
+%patch2 -p1 -b .CVE-2012-4564
+%patch3 -p1 -b .printdir-width
+%patch4 -p1 -b .jpeg-test
+%patch5 -p1 -b .CVE-2013-1960
+%patch6 -p1 -b .CVE-2013-1961
+%patch7 -p1 -b .manpage-update
+%patch8 -p1 -b .CVE-2013-4231
+%patch9 -p1 -b .CVE-2013-4232
+%patch10 -p1 -b .CVE-2013-4244
+%patch11 -p1
+
 %build
 %configure --with-jpeg-lib-dir=%{_libdir} --disable-cxx
 %__make %{?_smp_mflags}
@@ -159,10 +183,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Mar 19 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.7-1
-- new upstream release.
-- drooped patch1-11: fixed in upstream.
-
 * Thu Dec 26 2013 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.0.3-2
 - add patch1-11 from fc21 to fix security issues
 

+ 9 - 6
m/mesa/mesa-vl.spec

@@ -18,8 +18,8 @@
 Summary: Mesa graphics libraries
 Summary(ja): Mesa グラフィックスライブラリ
 Name: mesa
-Version: 11.2.2
-Release: 1%{?_dist_release}
+Version: 11.1.4
+Release: 2%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -31,6 +31,9 @@ Patch1: mesa-10.0-nv50-fix-build.patch
 Patch15: mesa-9.2-hardware-float.patch
 Patch20: mesa-10.2-evergreen-big-endian.patch
 
+# https://bugs.freedesktop.org/show_bug.cgi?id=73512
+Patch99: 0001-opencl-use-versioned-.so-in-mesa.icd.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
 BuildRequires: flex, bison
@@ -375,6 +378,10 @@ Mesa-based DRI drivers.
 %patch15 -p1 -b .hwfloat
 %patch20 -p1 -b .egbe
 
+%if 0%{?with_opencl}
+%patch99 -p1 -b .icd
+%endif
+
 
 %build
 
@@ -702,10 +709,6 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Fri Aug  5 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 11.2.2-1
-- updated to 11.2.2.
-- dropped Patch99: fixed in upstream.
-
 * Thu Jun 30 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 11.1.4-2
 - rebuild with gcc-5.4.0
 

+ 3 - 13
o/openjpeg2/openjpeg2-vl.spec

@@ -7,8 +7,8 @@
 #global optional_components 1
 
 Name:           openjpeg2
-Version:        2.1.2
-Release:        1%{?_dist_release}
+Version:        2.1.0
+Release:        5%{?_dist_release}
 Summary:        C-Library for JPEG 2000
 Summary(ja):    JPEG 2000 用の C ライブラリ
 
@@ -23,7 +23,7 @@ URL:            http://www.openjpeg.org/
 #   tar -cf openjpeg-2.0.0-$snap.tar.gz openjpeg-2.0.0
 Source0:        %{upname}-%{version}-%{snap}.tar.gz
 %else
-Source0:        https://github.com/uclouvain/openjpeg/archive/v%{version}/openjpeg-%{version}.tar.gz
+Source0:        http://sourceforge.net/projects/openjpeg.mirror/files/%{upname}-%{version}.tar.gz
 %endif
 %if 0%{?runcheck}
 # svn checkout http://openjpeg.googlecode.com/svn/data
@@ -32,10 +32,6 @@ Source1: data.tar.xz
 
 # Remove bundled libraries
 Patch0:         openjpeg2_remove-thirdparty.patch
-# Fix CVE-2016-9572 and CVE-2016-9573
-Patch1:         7b28bd2b723df6be09fe7791eba33147c1c47d0d.patch
-# Fix CVE-2016-9580 and CVE-2016-9581
-Patch2:         cadff5fb6e73398de26a92e96d3d7cac893af255.patch
 
 BuildRequires:  cmake
 BuildRequires:  zlib-devel
@@ -217,10 +213,7 @@ OpenJPEG2 JP3D module command line tools
 
 %prep
 %setup -q -n %{upname}-%{version} %{?runcheck:-a 1}
-
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 # Remove all third party libraries just to be sure
 rm -rf thirdparty
@@ -349,9 +342,6 @@ make test -C %{_target_platform}
 
 
 %changelog
-* Mon Mar 20 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.2-1
-- new upstream release.
-
 * Tue Jan 13 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.1.0-5
 - added japanese summary and Group tag
 

+ 25 - 34
s/smpeg/smpeg-vl.spec

@@ -1,18 +1,23 @@
-%define svn_rev 390
-
 Summary: SDL MPEG Library
 Summary(ja): SDL MPEG ライブラリ
 Name: smpeg
-Version: 0.4.5
-Release: 1%{?_dist_release}
+Version: 0.4.4
+Release: 2%{?_dist_release}
 License: LGPL
 Group: System Environment/Libraries
-Source0: %{name}-%{svn_rev}.tar.gz
-Patch3: smpeg-gtv.patch
-Patch4: smpeg-0.4.4-plaympeg.patch
-URL: http://icculus.org/smpeg
+Source0: %{name}-%{version}.tar.gz
+Patch0: smpeg-0.4.0-broken.patch
+Patch1: smpeg-0.4.4-gtvaudio.patch
+Patch2: smpeg-0.4.4-gcc32.patch
+Patch3: smpeg-0.4.4-fixes.patch
+Patch4: smpeg-0.4.4-PIC.patch
+Patch5: smpeg-0.4.4-gnu-stack.patch
+Patch6: smpeg-0.4.4-m4.patch
+Patch7: smpeg-0.4.4-gcc41.patch
+URL: http://www.lokigames.com/development/smpeg.php3
 
 BuildRequires: SDL-devel gtk+-devel
+BuildRequires: automake14 automake
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Vendor: Project Vine
@@ -46,34 +51,23 @@ to develop SMPEG applications.
 
 %prep
 %setup -q
-%patch3 -p1 -b .gtv~
-%patch4 -p1 -b .plaympeg~
+%patch0 -p1 -b .broken
+%patch1 -p1
+%patch2 -p0 -b .gcc32
+%patch3 -p0 -b .fixes
+%patch4 -p0 -b .PIC
+%patch5 -p1 -b .gnu-stack
+%patch6 -p1 -b .m4
+%patch7 -p1 -b .gcc41
 
 %build
-cat >acinclude.m4 <<EOF #HACK
-AC_DEFUN([AC_TYPE_SOCKLEN_T],
-[AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
-[
-  AC_TRY_COMPILE(
-  [#include <sys/socket.h>],
-  [socklen_t len = 42; return len;],
-  ac_cv_type_socklen_t=yes,
-  ac_cv_type_socklen_t=no)
-])
-  if test $ac_cv_type_socklen_t != yes; then
-    AC_DEFINE(socklen_t, int)
-  fi
-])
-AC_DEFUN([AM_PATH_GTK], [return 1])
-EOF
-
 # for automake...
 touch NEWS AUTHORS ChangeLog
 
-./autogen.sh
-%configure --disable-debug --disable-opengl-player --with-s
-dl-prefix=%{_prefix}
-make %{?_smp_mflags}
+automake -a || automake-1.4 -a 
+autoconf -f 
+%configure --disable-debug --disable-opengl-player
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -117,9 +111,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
-* Sun Jul 10 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.5-1
-- new upstream release.
-
 * Thu Feb  9 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.4-2
 - rebuild
 

+ 6 - 14
s/sqlite3/sqlite3-vl.spec

@@ -5,16 +5,16 @@
 
 %define with_check %{?_with_check:1}%{!?_with_check:0}
 
-%define realver 3170000
-%define docver 3170000
-%define rpmver 3.17.0.0
+%define realver 3080802
+%define docver 3080802
+%define rpmver 3.8.8.2
 
 
 Summary: SQLite is a C library that implements an embeddable SQL database engine
 Summary(ja): SQLite は組み込み型SQLデータベースエンジンを実装するCライブラリです。
 Name: %{packagename}
 Version: %{rpmver}
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: System Environment/Libraries
 URL: http://www.sqlite.org
 License: Public Domain
@@ -28,7 +28,7 @@ Patch1: sqlite-3.6.23-lemon-system-template.patch
 Patch4: sqlite-3.8.0-percentile-test.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: tcl-devel, libedit-devel, ncurses-devel
+BuildRequires: tcl-devel, readline-devel, ncurses-devel
 
 
 %description
@@ -147,16 +147,13 @@ autoconf
 export CFLAGS="$RPM_OPT_FLAGS 
                -DSQLITE_ENABLE_COLUMN_METADATA=1 
 	       -DSQLITE_DISABLE_DIRSYNC=1 
-	       -DSQLITE_ENABLE_FTS3=1
-	       -DSQLITE_ENABLE_FTS3_PARENTHESIS=1
-	       -DSQLITE_ENABLE_JSON1=1
+	       -DSQLITE_ENABLE_FTS3=3
 	       -DSQLITE_ENABLE_RTREE=1
 	       -DSQLITE_SECURE_DELETE=1
 	       -DSQLITE_ENABLE_UNLOCK_NOTIFY=1
 	       -Wall -fno-strict-aliasing"
 %configure --enable-load-extension \
            --enable-threadsafe \
-           --enable-fts5 \
 	   --enable-threads-override-locks
 
 %{__make} %{?_smp_mflags}
@@ -223,11 +220,6 @@ install -D -m0644 tool/lempar.c $RPM_BUILD_ROOT/%{_datadir}/lemon/lempar.c
 
 
 %changelog
-* Sun Mar 19 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.17.0.0-1
-- new upstream release.
-- enabled FTS5 and JSON1 extension.
-- built with libedit instead of readline.
-
 * Sun Mar 22 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.8.8.2-2
 - rebuilt with readline 6.3
 

+ 1 - 6
x/xl2tpd/xl2tpd-vl.spec

@@ -3,14 +3,13 @@
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: xl2tpd
 Version: 1.3.6
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 # No version specified.
 License: GPL+
 Url: http://www.xelerance.com/software/xl2tpd/
 Group: System Environment/Daemons
 # https://github.com/xelerance/xl2tpd/archive/v%{version}.tar.gz
 Source0: xl2tpd-%{version}.tar.gz
-Patch0: xl2tpd-1.3.6-timeout.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: ppp 
 BuildRequires: libpcap-devel
@@ -50,7 +49,6 @@ It was de-facto maintained by Jacco de Leeuw <jacco2@dds.nl> in 2002 and 2003.
 
 %prep
 %setup -q -n %{src_dir_name}
-%patch0 -p1 -b .timeout
 
 %build
 make DFLAGS="$RPM_OPT_FLAGS -g -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_FLOW -DDEBUG_PAYLOAD -DDEBUG_CONTROL -DDEBUG_CONTROL_XMIT -DDEBUG_FLOW_MORE -DDEBUG_MAGIC -DDEBUG_ENTROPY -DDEBUG_HIDDEN -DDEBUG_PPPD -DDEBUG_AAA -DDEBUG_FILE -DDEBUG_FLOW -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_ZLB -DDEBUG_AUTH"
@@ -99,9 +97,6 @@ fi
 %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control
 
 %changelog
-* Thu Apr  3 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.6-2
-- added Patch0.
-
 * Wed Apr  2 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.6-1
 - new upstream release.