diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-crypt/mit-krb5-appl/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-crypt/mit-krb5-appl/files')
-rw-r--r-- | app-crypt/mit-krb5-appl/files/mit-krb5-appl-sig_t.patch | 55 | ||||
-rw-r--r-- | app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch | 12 |
2 files changed, 67 insertions, 0 deletions
diff --git a/app-crypt/mit-krb5-appl/files/mit-krb5-appl-sig_t.patch b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-sig_t.patch new file mode 100644 index 000000000000..ebdaf6b5b3d2 --- /dev/null +++ b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-sig_t.patch @@ -0,0 +1,55 @@ +Bug #513762 + +From 4b45a32ba7c4f7b447919de6ce28a14150584290 Mon Sep 17 00:00:00 2001 +From: Russ Allbery <rra@stanford.edu> +Date: Wed, 21 Mar 2012 04:16:36 +0000 +Subject: [PATCH] Move redeclaration of sig_t after all system includes + +Move some internal messing about with sig_t done by gssftp/ftp/ftp_var.h +after the last system include to keep from stomping on system headers. +Required for kFreeBSD and Hurd. + +git-svn-id: svn://anonsvn.mit.edu/krb5-appl/trunk@3331 dc483132-0cff-0310-8789-dd5450dbe970 +--- + gssftp/ftp/ftp_var.h | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/gssftp/ftp/ftp_var.h b/gssftp/ftp/ftp_var.h +index 3efbdb1..e478961 100644 +--- a/gssftp/ftp/ftp_var.h ++++ b/gssftp/ftp/ftp_var.h +@@ -53,15 +53,6 @@ FILE* fdopen_socket(SOCKET s, char* mode); + #define PERROR_SOCKET(str) perror(str) + #endif + +-#ifdef _WIN32 +-typedef void (*sig_t)(int); +-typedef void sigtype; +-#else +-#define sig_t my_sig_t +-#define sigtype krb5_sigtype +-typedef sigtype (*sig_t)(); +-#endif +- + /* + * FTP global variables. + */ +@@ -168,6 +159,15 @@ extern int macnum; /* number of defined macros */ + extern struct macel macros[16]; + extern char macbuf[4096]; + ++#ifdef _WIN32 ++typedef void (*sig_t)(int); ++typedef void sigtype; ++#else ++#define sig_t my_sig_t ++#define sigtype krb5_sigtype ++typedef sigtype (*sig_t)(); ++#endif ++ + #ifdef DEFINITIONS + #undef extern + #endif +-- +1.9.3 + diff --git a/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch new file mode 100644 index 000000000000..54c18665d336 --- /dev/null +++ b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch @@ -0,0 +1,12 @@ +--- configure.ac 2011-07-11 22:34:17.000000000 +0300 ++++ configure.ac 2013-02-28 15:12:24.693841664 +0200 +@@ -152,7 +152,8 @@ + [AC_DEFINE(TERMCAP,1,[Define if termcap library is available]) + LIBS="$LIBS -ltermcap"]) + AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses", +- [AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses")]) ++ [AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses", ++ [AC_CHECK_LIB(tinfo,setupterm,LIBS="$LIBS -lncurses")])]) + AC_CHECK_FUNCS(setupterm) + TELNET_LIBS="$LIBS" + TELNETD_LIBS="$LIBS" |