diff options
| author | Jay Freeman <saurik@saurik.com> | 2008-09-14 22:47:28 +0000 |
|---|---|---|
| committer | Jay Freeman <saurik@saurik.com> | 2008-09-14 22:47:28 +0000 |
| commit | f9fe7aca30def443efabeae32e355b405c5c2da1 (patch) | |
| tree | 157cc2b54a3e77ff346a4f213307f100ca332cd6 /data/apt | |
| parent | 41a1030afbc947c2ea7e788d4326bd11cec26725 (diff) | |
Finalized 2.1 Cydia.
git-svn-id: http://svn.telesphoreo.org/trunk@475 514c082c-b64e-11dc-b46d-3d985efe055d
Diffstat (limited to 'data/apt')
| -rw-r--r-- | data/apt/cfnetwork.diff | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/data/apt/cfnetwork.diff b/data/apt/cfnetwork.diff index 3f865b154..7b9fbd90a 100644 --- a/data/apt/cfnetwork.diff +++ b/data/apt/cfnetwork.diff @@ -9,12 +9,13 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc #include <sys/stat.h> #include <sys/time.h> #include <utime.h> -@@ -43,6 +48,11 @@ +@@ -43,6 +48,12 @@ // Internet stuff #include <netdb.h> +#include <arpa/inet.h> + ++#include <lockdown.h> +#include <CoreFoundation/CoreFoundation.h> +#include <CoreServices/CoreServices.h> +#include <SystemConfiguration/SystemConfiguration.h> @@ -27,7 +28,7 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc +CFStringRef Firmware_; +const char *Machine_; -+const char *SerialNumber_; ++CFStringRef UniqueID_; + +void CfrsError(const char *name, CFReadStreamRef rs) { + CFStreamError se = CFReadStreamGetError(rs); @@ -73,7 +74,7 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc string HttpMethod::FailFile; int HttpMethod::FailFd = -1; time_t HttpMethod::FailTime = 0; -@@ -1062,159 +1117,257 @@ +@@ -1062,159 +1117,256 @@ if (Queue == 0) continue; @@ -188,9 +189,8 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc + CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("X-Machine"), sr); + CFRelease(sr); + -+ sr = CFStringCreateWithCString(kCFAllocatorDefault, SerialNumber_, se); -+ CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("X-Serial-Number"), sr); -+ CFRelease(sr); ++ if (UniqueID_ != NULL) ++ CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("X-Unique-ID"), UniqueID_); + + CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("User-Agent"), CFSTR("Telesphoreo APT-HTTP/1.0.98")); + @@ -470,7 +470,7 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc FailCounter = 0; } -@@ -1224,6 +1386,39 @@ +@@ -1224,6 +1386,34 @@ setlocale(LC_ALL, ""); HttpMethod Mth; @@ -498,15 +498,10 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc + CFRelease(plist); + } + -+ if (CFMutableDictionaryRef dict = IOServiceMatching("IOPlatformExpertDevice")) -+ if (io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault, dict)) { -+ if (CFTypeRef serial = IORegistryEntryCreateCFProperty(service, CFSTR(kIOPlatformSerialNumberKey), kCFAllocatorDefault, 0)) { -+ SerialNumber_ = strdup(CFStringGetCStringPtr((CFStringRef) serial, CFStringGetSystemEncoding())); -+ CFRelease(serial); -+ } -+ -+ IOObjectRelease(service); -+ } ++ if (void *lockdown = lockdown_connect()) { ++ UniqueID_ = lockdown_copy_value(lockdown, NULL, kLockdownUniqueDeviceIDKey); ++ lockdown_disconnect(lockdown); ++ } return Mth.Loop(); } @@ -518,7 +513,7 @@ diff -ru apt-0.6.46.4.1/methods/makefile apt-0.6.46.4.1+iPhone/methods/makefile # The http method PROGRAM=http -SLIBS = -lapt-pkg $(SOCKETLIBS) -+SLIBS = -lapt-pkg $(SOCKETLIBS) -framework CoreFoundation -framework CFNetwork -framework SystemConfiguration -framework IOKit ++SLIBS = -lapt-pkg $(SOCKETLIBS) -framework CoreFoundation -framework CFNetwork -framework SystemConfiguration -framework IOKit -llockdown LIB_MAKES = apt-pkg/makefile SOURCE = http.cc rfc2553emu.cc connect.cc include $(PROGRAM_H) |