-# based on: http://www.t17.ds.pwr.wroc.pl/~misiek/ipv6/cvs-1.11.2-20020513-ipv6.patch.gz
-Patch0: %{name}-ipv6.patch
-Patch1: %{name}-zlib.patch
-Patch2: %{name}-fixed_buffer.patch
-Patch3: %{name}-cvspass.patch
-Patch4: %{name}-home_etc.patch
-Patch5: %{name}-newnline.patch
-Patch6: %{name}-no_libnsl.patch
-Patch7: %{name}-info.patch
-Patch8: %{name}-ssh.patch
-Patch9: %{name}-posix.patch
-# Access Control List Extension: http://cvsacl.sourceforge.net/
-Patch10: %{name}-acl.patch
-Patch11: %{name}-CAN_2005_2693.patch
-URL: http://www.non-gnu.org/cvs/
+Patch1: %{name}-fixed_buffer.patch
+Patch2: %{name}-home_etc.patch
+Patch3: %{name}-no_libnsl.patch
+Patch4: %{name}-info.patch
+Patch5: %{name}-posix.patch
+Patch6: %{name}-CAN_2005_2693.patch
+Patch7: %{name}-cvspass.patch
+Patch8: %{name}-datetime.patch
+Patch9: %{name}-getcwd.patch
+Patch10: %{name}-ac.patch
+Patch11: %{name}-printf-n.patch
+Patch12: %{name}-am.patch
+
+# patches from debian
+Patch100: %{name}-debian-64bit-crash.patch
+Patch101: %{name}-debian-check-method-crash.patch
+Patch102: %{name}-debian-sparc.patch
+Patch103: %{name}-debian-zlib-read-compressed.patch
+Patch104: %{name}-debian-cvsrc.patch
+Patch105: %{name}-debian-date-format.patch
+Patch106: %{name}-debian-dsa-ext-pwd.patch
+Patch107: %{name}-debian-ext-exp.patch
+Patch108: %{name}-debian-extra-tags.patch
+Patch109: %{name}-debian-flag-conflicted-copies.patch
+Patch110: %{name}-debian-homedir.patch
+Patch111: %{name}-debian-import-n-X.patch
+Patch112: %{name}-debian-R-warning.patch
+Patch113: %{name}-debian-keyword-alnum.patch
+Patch114: %{name}-debian-l-opt.patch
+Patch115: %{name}-debian-newlines-commit-template.patch
+Patch116: %{name}-debian-normalize-roots.patch
+Patch117: %{name}-debian-pam.patch
+Patch118: %{name}-debian-parseopts.patch
+Patch119: %{name}-debian-perms.patch
+Patch120: %{name}-debian-server-wrapper.patch
+Patch121: %{name}-debian-repouid.patch
+Patch122: %{name}-debian-rsc2log.patch
+
+URL: http://www.nongnu.org/cvs/