diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-11-28 16:46:46 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-11-28 16:46:46 +0100 |
| commit | ac3dee0e5091f19b77de96eec5241cb57c13f2a1 (patch) | |
| tree | 2a82dd1c7a487f830bc4ec569c9f4e3775ddf4e8 /methods | |
| parent | 318dd26ac9bdbb30bcd22201393dc73d8566b3cf (diff) | |
| parent | 757f20941a19d5e1e9ebd74ecd5a4d5b0012644f (diff) | |
merge with the debian tree
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/copy.cc | 4 | ||||
| -rw-r--r-- | methods/ftp.cc | 2 | ||||
| -rw-r--r-- | methods/gpgv.cc | 6 | ||||
| -rw-r--r-- | methods/makefile | 5 |
4 files changed, 9 insertions, 8 deletions
diff --git a/methods/copy.cc b/methods/copy.cc index 8dd0bd3f5..027b59f46 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -13,7 +13,6 @@ #include <apt-pkg/acquire-method.h> #include <apt-pkg/error.h> #include <apt-pkg/hashes.h> -#include <apt-pkg/fileutl.h> #include <sys/stat.h> #include <utime.h> @@ -80,11 +79,12 @@ bool CopyMethod::Fetch(FetchItem *Itm) To.OpFail(); return _error->Errno("utime",_("Failed to set modification time")); } - + Hashes Hash; FileFd Fd(Res.Filename, FileFd::ReadOnly); Hash.AddFD(Fd.Fd(), Fd.Size()); Res.TakeHashes(Hash); + URIDone(Res); return true; } diff --git a/methods/ftp.cc b/methods/ftp.cc index 0c2aa00a7..554a24cf5 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1101,7 +1101,7 @@ int main(int argc,const char *argv[]) char S[300]; snprintf(S,sizeof(S),"http_proxy=%s",getenv("ftp_proxy")); putenv(S); - putenv("no_proxy="); + putenv((char *)"no_proxy="); // Run the http method string Path = flNotFile(argv[0]) + "http"; diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 227e08d63..2b1fa5169 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -121,9 +121,9 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, // Redirect the pipe to the status fd (3) dup2(fd[1], 3); - putenv("LANG="); - putenv("LC_ALL="); - putenv("LC_MESSAGES="); + putenv((char *)"LANG="); + putenv((char *)"LC_ALL="); + putenv((char *)"LC_MESSAGES="); execvp(gpgvpath.c_str(), (char **)Args); exit(111); diff --git a/methods/makefile b/methods/makefile index b7c595754..085b357b8 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,7 +7,7 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 4.5 +LIB_APT_PKG_MAJOR = 4.6 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method @@ -94,9 +94,10 @@ LIB_MAKES = apt-pkg/makefile SOURCE = mirror.cc http.cc rfc2553emu.cc connect.cc include $(PROGRAM_H) -# SSH and bzip2,lzma method symlinks +# SSH and bzip2 method symlink binary: $(BIN)/ssh $(BIN)/bzip2 $(BIN)/lzma veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2 clean-$(BIN)/lzma + $(BIN)/ssh: echo "Installing ssh method link" ln -fs rsh $(BIN)/ssh |