Parcourir la source

stop exporting the accidently exported parsenetrc() symbol

Michael Vogt il y a 13 ans
Parent
commit
7f8f2c43b1
4 fichiers modifiés avec 2 ajouts et 17 suppressions
  1. 0 12
      apt-pkg/contrib/netrc.cc
  2. 0 4
      apt-pkg/contrib/netrc.h
  3. 1 1
      configure.in
  4. 1 0
      debian/changelog

+ 0 - 12
apt-pkg/contrib/netrc.cc

@@ -155,18 +155,6 @@ static int parsenetrc_string (char *host, std::string &login, std::string &passw
 
   return retcode;
 }
-// for some unknown reason this method is exported so keep a compatible interface for now …
-int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
-{
-   std::string login_string, password_string;
-   int const ret = parsenetrc_string(host, login_string, password_string, netrcfile);
-   if (ret < 0)
-      return ret;
-   strncpy(login, login_string.c_str(), LOGINSIZE - 1);
-   strncpy(password, password_string.c_str(), PASSWORDSIZE - 1);
-   return ret;
-}
-
 
 void maybe_add_auth (URI &Uri, string NetRCFile)
 {

+ 0 - 4
apt-pkg/contrib/netrc.h

@@ -25,9 +25,5 @@
 
 class URI;
 
-// kill this export on the next ABI break - strongly doubt its in use anyway
-// outside of the apt itself, its really a internal interface
-__deprecated int parsenetrc (char *host, char *login, char *password, char *filename);
-
 void maybe_add_auth (URI &Uri, std::string NetRCFile);
 #endif

+ 1 - 1
configure.in

@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 PACKAGE="apt"
-PACKAGE_VERSION="0.9.7.6"
+PACKAGE_VERSION="0.9.8~exp1~20121017"
 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")

+ 1 - 0
debian/changelog

@@ -8,6 +8,7 @@ apt (0.9.8~exp1) UNRELEASED; urgency=low
   * lp:~mvo/apt/webserver-simulate-broken-with-fix346386:
     - fix invalid InRelease file download checking and add regression
       test to server broken files to the buildin test webserver
+  * stop exporting the accidently exported parsenetrc() symbol
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 09 Jul 2012 17:36:40 +0200