ƒ¼150179 122 31036 130 185 115 161 178 111 225 318 132 115 115 113 114 623 131 138 113 235 385 215 196 112 126 110 182 111 123 183 129 129 164 184 109 140 185 109 538 277 231 189 204 210 120 245 187 339 184 176 228 225 107 339 225 226 234 241 229 207 208 234 111 173 179 242 177 245 178 112 312 162 187 195 187 190 121 311 141 128 187 304 158 482 160 182 121 234 273 293 203 264 689 187 191 125 184 701 233 218 279 710 145 149 188 132 112 142 211 111 283 349 203 116 423 137 138 138 277 144 116 214 110 K 10 svn:author V 5 edwin K 8 svn:date V 27 2005-12-02T00:09:16.000000Z K 7 svn:log V 30939 re-roll of tarball Only in cpige-1.3-new/: LICENCE Only in cpige-1.3-new/: Makefile.windows diff -ru cpige/cpige.c cpige-1.3-new/cpige.c --- cpige/cpige.c Fri Nov 25 10:08:13 2005 +++ cpige-1.3-new/cpige.c Wed Nov 30 07:06:12 2005 @@ -21,7 +21,10 @@ #include #include #include -#include + +#ifndef WIN32 + #include +#endif #include "cpige.h" #include "tool.h" @@ -115,12 +118,12 @@ /* Global dynamic configuration */ cmdLine = parseCommandLine(argc, argv); - (void) testCommandLine(); + testCommandLine(); /* Logfile */ if ((logfile = fopen(cmdLine->logFile, "a+")) == NULL) { - ERROR("Unable to openlogfile: %s Setting log to stdout\n", cmdLine->logFile); + _ERROR("Unable to openlogfile: %s Setting log to stdout\n", cmdLine->logFile); logfile = stdout; } else { VERBOSE("Successfully opened %s\n", cmdLine->logFile); @@ -134,20 +137,20 @@ #if !WIN32 if (daemon(1, 1) == -1) { - ERROR("Error daemonizing. %s\n", strerror(errno)); + _ERROR("Error daemonizing. %s\n", strerror(errno)); exit(-1); } - (void) fprintf(stdout, "Server launching in background. pid: %d\n", (int)getpid()); + fprintf(stdout, "Server launching in background. pid: %d\n", (int)getpid()); fd = open("/dev/null", O_RDWR); if (fd == -1) { perror("Opening /dev/null: "); exit(0); } for (i = 0; i < 3; i++) - (void) dup2(fd, i); - (void) close(fd); + dup2(fd, i); + close(fd); #else - (void) printf("Fork not available on WIN32.\n"); + printf("Fork not available on WIN32.\n"); #endif } @@ -158,13 +161,13 @@ /* Create output dir if does not exists! */ if (( pige_dir = opendir(cmdLine->dir)) == NULL) { - ERROR("Unable to open %s for writing\n", cmdLine->dir); + _ERROR("Unable to open %s for writing\n", cmdLine->dir); #ifdef WIN32 if (mkdir(cmdLine->dir) != 0) { #else if (mkdir(cmdLine->dir, 0755) != 0) { #endif - ERROR("Failed trying to create %s. Verify rights.\n", cmdLine->dir); + _ERROR("Failed trying to create %s. Verify rights.\n", cmdLine->dir); exit(-1); } else { VERBOSE("Created %s\n", cmdLine->dir); @@ -172,7 +175,7 @@ } } else { VERBOSE("Sucessfully opened %s\n", cmdLine->dir); - (void) closedir(pige_dir); + closedir(pige_dir); } /* Start time, for uptime calculation */ @@ -204,13 +207,15 @@ * print_icyheaders(icy_headers); */ +#ifndef WIN32 if(cmdLine->useNumbers == 1) songs = getSongs(cmdLine->dir); - +#endif + nextsize = 512; oldtitre = memory_allocation(strlen("please.delete") + 1); - (void) strcpy(oldtitre, "please.delete"); + strncpy(oldtitre, "please.delete", 14); while (1) { @@ -220,7 +225,7 @@ retval = select(server_socket+1, &rfds, NULL, NULL, &timeout); if (retval <= 0) { - ERROR("Connection Error.\n"); + _ERROR("Connection Error.\n"); server_close(server_socket); server_socket = reconnect(RECONNECT_TIME, TENTATIVES, 1); tempsize = 0; @@ -230,7 +235,7 @@ size = recv(server_socket, buffer, nextsize, 0); if ((size == -1) || ((size == 0) && nextsize != 0)) { - ERROR("Connection error in recv main() size: %d nextsize: %d\n", size, nextsize); + _ERROR("Connection error in recv main() size: %d nextsize: %d\n", size, nextsize); server_socket = reconnect(RECONNECT_TIME, TENTATIVES, 1); tempsize = 0; nextsize = 512; @@ -240,11 +245,11 @@ { if (fwrite(buffer, sizeof(char), size, output_file) != size*sizeof(char)) { - ERROR("Error writing output. Disk full ?\n"); + _ERROR("Error writing output. Disk full ?\n"); break; } /* Many thanks to the #hurdfr team! */ - (void) fflush(output_file); + fflush(output_file); } if ( tempsize == icy_headers->metaint ) { @@ -275,15 +280,15 @@ buffer3 = GetId3v1(buffer2, buffer1, icy_headers->name); fwrite(buffer3, sizeof(char), 128, output_file); - free(buffer3); - free(buffer2); - free(buffer1); + (void)free(buffer3); + (void)free(buffer2); + (void)free(buffer1); } if (output_file) { /* VERBOSE("Closing: %d.mp3\n", lastCut.hour); */ - (void) fclose(output_file); + fclose(output_file); } switch (cmdLine->intervalType) @@ -313,10 +318,10 @@ } VERBOSE("Opening: %s\n", filename); output_file = fopen(filename, WRITE); - free(filename); + (void)free(filename); } } else if (cmdLine->live) { - (void) printf("Not yet implemented.\n"); + printf("Not yet implemented.\n"); exit(1); /* Live Mode */ /* I must write some stuff here ;) */ @@ -337,13 +342,13 @@ fprintf(stdout, " "); statusline = statusLine(uptime, metacounter, icy_headers->metaint, oldtitre, nexttitre); - (void) fprintf(stdout, "\r%s", statusline); + fprintf(stdout, "\r%s", statusline); if ( strlen(statusline) > maxlinelength) maxlinelength = strlen(statusline); if (statusline != NULL) - free(statusline); + (void)free(statusline); } /* Stats evry countdown seconds */ @@ -354,12 +359,12 @@ { if (fwrite(statusline, sizeof(char), strlen(statusline), logfile) != strlen(statusline)) { - ERROR("Fwrite error.\n"); + _ERROR("Fwrite error.\n"); break; } /* Many thanks to the #hurdfr@freenode team! */ - (void) fflush(logfile); - (void) free(statusline); + fflush(logfile); + (void)free(statusline); } else { VERBOSE("getStats returned NULL values...\n"); } @@ -379,7 +384,7 @@ titre = getTitle(meta); if (meta != NULL) - free(meta); + (void)free(meta); if (titre != NULL) { @@ -408,19 +413,19 @@ { char *buffer1; buffer1 = GetId3v1(curSong->title, curSong->artist, icy_headers->name); - (void) fwrite(buffer1, sizeof(char), 128, output_file); - free(buffer1); + fwrite(buffer1, sizeof(char), 128, output_file); + (void)free(buffer1); } - (void) fclose(output_file); + fclose(output_file); } if (cmdLine->useNumbers == 0) { filename = memory_allocation(strlen(titre) + strlen(cmdLine->dir)+ 1 + strlen(extension) + 1 +1); - (void) snprintf(filename, strlen(titre)+strlen(extension)+strlen(cmdLine->dir)+1+1, "%s%s.%s", cmdLine->dir, titre, extension); + snprintf(filename, strlen(titre)+strlen(extension)+strlen(cmdLine->dir)+1+1, "%s%s.%s", cmdLine->dir, titre, extension); } else { filename = memory_allocation(5+strlen(titre) + strlen(cmdLine->dir)+ 1 + strlen(extension) + 1 + 1); - (void) snprintf(filename, 5+strlen(titre)+strlen(extension)+strlen(cmdLine->dir)+1+1, "%s%.4d_%s.%s", cmdLine->dir, songs, titre, extension); + snprintf(filename, 5+strlen(titre)+strlen(extension)+strlen(cmdLine->dir)+1+1, "%s%.4d_%s.%s", cmdLine->dir, songs, titre, extension); } if ((output_file = fopen(filename, "r")) == NULL) { /* Anti doublons */ @@ -428,31 +433,33 @@ output_file = fopen(filename, WRITE); } else { VERBOSE("File already exists %s.\n", filename); - (void) fclose(output_file); + fclose(output_file); output_file = NULL; } - (void) free(filename); + (void)free(filename); } } /* Title are differents */ } /* Oldtitre != NULL */ - if (oldtitre != NULL) free(oldtitre); + if (oldtitre != NULL) + (void)free(oldtitre); oldtitre = memory_allocation(strlen(titre) + 1); - (void) strncpy(oldtitre, titre, strlen(titre)); + strncpy(oldtitre, titre, strlen(titre)); } else { /* Title is "ASUIVRE" */ - if (nexttitre != NULL) free(nexttitre); + if (nexttitre != NULL) + (void)free(nexttitre); nexttitre = memory_allocation(strlen(titre) + 1); - (void) strncpy(nexttitre, titre, strlen(titre)); + strncpy(nexttitre, titre, strlen(titre)); } if (titre != NULL) - free(titre); + (void)free(titre); } /* Strlen(titre > 0) */ } tempsize = 0; /* tempsize = 0: chunk received successfully. Awaiting next chunk */ } else if (tempsize > icy_headers->metaint) { - ERROR("Error tempsize > metaint\n"); + _ERROR("Error tempsize > metaint\n"); break; } else tempsize = tempsize + size; @@ -463,14 +470,18 @@ nextsize = 512; } /* infinite loop */ - (void) server_close(server_socket); + server_close(server_socket); /* cleanup */ - if (icy_headers != NULL) free(icy_headers); - if (output_file != NULL) fclose(output_file); - if (logfile != stdout) fclose(logfile); - (void) free(cmdLine); - (void) free(cPigeStats); + if (icy_headers != NULL) + (void)free(icy_headers); + if (output_file != NULL) + fclose(output_file); + if (logfile != stdout) + fclose(logfile); + + (void)free(cmdLine); + (void)free(cPigeStats); return 0; } @@ -491,9 +502,10 @@ suffix[0] = 0; icy = malloc(sizeof(icyHeaders)); - + /* Usefull when radio doesn't specify icy name */ icy->name = "No Name"; + icy->content_type = "audio/mpeg"; if (headers == NULL) return NULL; @@ -549,7 +561,7 @@ if (strncmp(prefix, "icy-notice1", 11) == 0) { icy->notice1 = memory_allocation(strlen(suffix) + 1); - (void) strncpy(icy->notice1, suffix, strlen(suffix)); + strncpy(icy->notice1, suffix, strlen(suffix)); } if (strncmp(prefix, "icy-notice2", 11) == 0) { @@ -557,25 +569,25 @@ icy->type = 0; icy->notice2 = memory_allocation(strlen(suffix)+1); - (void) strncpy(icy->notice2, suffix, strlen(suffix)); + strncpy(icy->notice2, suffix, strlen(suffix)); } if (strncmp(prefix, "icy-name", 8) == 0) { icy->name = memory_allocation(strlen(suffix)+1); - (void) strncpy(icy->name, suffix, strlen(suffix)); + strncpy(icy->name, suffix, strlen(suffix)); } if (strncmp(prefix, "icy-genre", 9) == 0) { icy->genre = memory_allocation(strlen(suffix)+1); - (void) strncpy(icy->genre, suffix, strlen(suffix)); + strncpy(icy->genre, suffix, strlen(suffix)); } if (strncmp(prefix, "icy-url", 7) == 0) { icy->url = memory_allocation(strlen(suffix)+1); - (void) strncpy(icy->url, suffix, strlen(suffix)); + strncpy(icy->url, suffix, strlen(suffix)); } if (strncmp(prefix, "icy-pub", 7) == 0) @@ -587,14 +599,16 @@ if (strncmp(prefix, "icy-br", 6) == 0 ) icy->br = (int) atoi((char *) &suffix[0]); - if (strncmp(prefix, "content-type", 12) == 0 ) { + if ((strncmp(prefix, "content-type", 12) == 0 ) || + (strncmp(prefix, "Content-Type", 12) == 0)) + { icy->content_type = memory_allocation(strlen(suffix)+1); - (void) strncpy(icy->content_type, suffix, strlen(suffix)); + strncpy(icy->content_type, suffix, strlen(suffix)); } } } /* for eachline */ - (void) free(headers); + (void)free(headers); return icy; } @@ -621,7 +635,7 @@ cu = getUptime(uptime); line = memory_allocation(300); /* Exessif. */ - (void) sprintf(line, "Uptime: %d days, %d hours, %d min, %d seconds\nDownloaded: %lldKo\nSongs played: %ld\nReconnections: %ld\n", cu->day, cu->hour, cu->min, cu->sec, (long long unsigned int)((metacounter*metaint)/1024), cPigeStats->songs, cPigeStats->reconnections); + sprintf(line, "Uptime: %d days, %d hours, %d min, %d seconds\nDownloaded: %lldKo\nSongs played: %ld\nReconnections: %ld\n", cu->day, cu->hour, cu->min, cu->sec, (long long unsigned int)((metacounter*metaint)/1024), cPigeStats->songs, cPigeStats->reconnections); return line; } @@ -636,16 +650,16 @@ /* Pas terrible... */ line = memory_allocation(300); - (void) sprintf(line, "[%dj %dh:%dm:%ds][%lldKo] ", cu->day, cu->hour, cu->min, cu->sec, (long long unsigned int)((metacounter * metaint) / 1024)); + sprintf(line, "[%dj %dh:%dm:%ds][%lldKo] ", cu->day, cu->hour, cu->min, cu->sec, (long long unsigned int)((metacounter * metaint) / 1024)); if (cmdLine->pige) - (void) sprintf(line+strlen(line), "%dh -> %dh ", getHour(), getHour()+1); + sprintf(line+strlen(line), "%dh -> %dh ", getHour(), getHour()+1); if (titre != NULL) - (void) sprintf(line+strlen(line), "%s", titre); + sprintf(line+strlen(line), "%s", titre); if (nexttitre != NULL) if (strstr(nexttitre, titre) == NULL) - (void) sprintf(line+strlen(line), " -> %s", nexttitre); + sprintf(line+strlen(line), " -> %s", nexttitre); return line; } @@ -669,7 +683,7 @@ if (serversPool == NULL) { - ERROR("Error: not any server defined.\n"); + _ERROR("Error: not any server defined.\n"); exit(1); } @@ -677,7 +691,7 @@ settings = getSettings(serversPool, &poolPosition); if (settings == NULL) { - ERROR("No valid settings in urlPool.\n"); + _ERROR("No valid settings in urlPool.\n"); exit(1); } @@ -690,7 +704,7 @@ settings = getSettings(serversPool, &poolPosition); if (settings == NULL) { - ERROR("No valid settings in urlPool.\n"); + _ERROR("No valid settings in urlPool.\n"); exit(1); } @@ -708,7 +722,7 @@ if (sendHeaders(server_socket, settings->mountpoint, 1) <= 0) { - ERROR("Error sending headers: 0 byte sent.\n"); + _ERROR("Error sending headers: 0 byte sent.\n"); goto RECO; } @@ -731,21 +745,21 @@ headers = memory_allocation(256); if (mountpoint == NULL) - (void) sprintf(headers, "GET / HTTP/1.0\r\n"); + sprintf(headers, "GET / HTTP/1.0\r\n"); else - (void) sprintf(headers, "GET %s HTTP/1.0\r\n", mountpoint); + sprintf(headers, "GET %s HTTP/1.0\r\n", mountpoint); if (metadata) - (void) strcat(headers, "Icy-MetaData:1\r\n"); + strncat(headers, "Icy-MetaData:1\r\n", 16); else - (void) strcat(headers, "Icy-MetaData:0\r\n"); + strncat(headers, "Icy-MetaData:0\r\n", 16); - (void) strcat(headers, "User-Agent:"); - (void) strcat(headers, USER_AGENT); - (void) strcat(headers, "\r\n\r\n"); + strncat(headers, "User-Agent:", 11); + strncat(headers, USER_AGENT, strlen(USER_AGENT)); + strncat(headers, "\r\n\r\n", 4); ret = send(serversocket, headers, strlen(headers), 0); - (void) free(headers); + (void)free(headers); return ret; } @@ -766,12 +780,12 @@ retval = select(server_socket+1, &rfds, NULL, NULL, &timeout); if (retval <= 0) { - ERROR("Erreur de connexion!\n"); - (void) server_close(server_socket); + _ERROR("Erreur de connexion!\n"); + server_close(server_socket); return NULL; } else if (recv(server_socket, &c, 1, 0) != 1) { - ERROR("Error reading from shoutcast socket\n"); - (void) server_close(server_socket); + _ERROR("Error reading from shoutcast socket\n"); + server_close(server_socket); return NULL; } @@ -786,10 +800,10 @@ retval = select(server_socket+1, &rfds, NULL, NULL, &timeout); if (retval <= 0) { - (void) printf("Connection error in select. (readmeta)\n"); - (void) free(buffer); - (void) free(meta); - (void) server_close(server_socket); + printf("Connection error in select. (readmeta)\n"); + (void)free(buffer); + (void)free(meta); + server_close(server_socket); return NULL; } else { readsize = 0; @@ -802,21 +816,21 @@ retval = select(server_socket+1, &rfds, NULL, NULL, &timeout); if (retval <= 0) { - ERROR("Erreur de connexion!\n"); - (void) server_close(server_socket); + _ERROR("Erreur de connexion!\n"); + server_close(server_socket); return NULL; } else { size = recv(server_socket, buffer, (c*16 - readsize), 0); if (size <= 0) { VERBOSE("Megaproblem here.\n"); - (void) server_close(server_socket); + server_close(server_socket); } readsize += size; - (void) strncat(meta, buffer, size); + strncat(meta, buffer, size); } } - (void) free(buffer); + (void)free(buffer); } } else { /* Title was not sent. */ @@ -903,13 +917,13 @@ if (strlen(cursong->title) == 0) { - (void) free(cursong->title); + (void)free(cursong->title); cursong->title = NULL; } if (strlen(cursong->artist) == 0) { - (void) free(cursong->artist); + (void)free(cursong->artist); cursong->artist = NULL; } @@ -956,7 +970,7 @@ { return 1; } else { - ERROR("Error: return code from HTTP server: %d.\n", returnCode); + _ERROR("Error: return code from HTTP server: %d.\n", returnCode); return 0; } } @@ -973,7 +987,7 @@ char c; buffer = memory_allocation(256); - (void) memset(headers, 0, 4096); + memset(headers, 0, 4096); /* For select() it's a global struct. */ timeout.tv_sec = SOCKET_TIMEOUT; @@ -982,13 +996,13 @@ retval = select(server_socket+1, &rfds, NULL, NULL, &timeout); if (retval <= 0) { - ERROR("Erreur de connexion in getHeaders().\n"); + _ERROR("Erreur de connexion in getHeaders().\n"); goto error; } if (recv(serversocket, buffer, 256, 0) <= 0) { - ERROR("Erreur de connexion.\n"); + _ERROR("Erreur de connexion.\n"); goto error; } @@ -998,7 +1012,7 @@ goto error; } - free(buffer); + (void)free(buffer); buffer = NULL; headers[0] = 0; @@ -1015,7 +1029,7 @@ goto error; } else if (recv(server_socket, &c, 1, 0) != 1) { - ERROR("Error reading data in getHeaders()\n"); + _ERROR("Error reading data in getHeaders()\n"); goto error; } @@ -1033,13 +1047,13 @@ headers[i] = 0; if (!strlen(headers)) { return NULL; } ptr = memory_allocation(strlen(headers)+1); - (void) strncpy(ptr, headers, strlen(headers)); + strncpy(ptr, headers, strlen(headers)); return ptr; error: - (void) server_close(server_socket); + server_close(server_socket); if (buffer != NULL) - free(buffer); + (void)free(buffer); return NULL; } @@ -1053,7 +1067,7 @@ chunk = memory_allocation(128); /* id3v1 tag */ - (void) sprintf(chunk, "TAG"); + sprintf(chunk, "TAG"); /* Title */ relativePointer = chunk + 3; /* 3 octets */ @@ -1061,13 +1075,13 @@ padding = (30 - strlen(titre)); if (padding < 0) { - (void) snprintf(relativePointer+3, 31, "%s", titre); + snprintf(relativePointer+3, 31, "%s", titre); } else { - (void) sprintf(relativePointer, "%s", titre); - (void) memset(relativePointer + (30-padding), 0, padding); + sprintf(relativePointer, "%s", titre); + memset(relativePointer + (30-padding), 0, padding); } } else { - (void) memset(relativePointer, 0, 30); + memset(relativePointer, 0, 30); } /* Artist */ @@ -1075,13 +1089,13 @@ if (artiste) { padding = (30 - strlen(artiste)); if (padding < 0) { - (void) snprintf(relativePointer, 31, "%s", artiste); + snprintf(relativePointer, 31, "%s", artiste); } else { - (void) sprintf(relativePointer, "%s", artiste); - (void) memset(relativePointer + (30 - padding), 0, padding); + sprintf(relativePointer, "%s", artiste); + memset(relativePointer + (30 - padding), 0, padding); } } else { - (void) memset(relativePointer, 0, 30); + memset(relativePointer, 0, 30); } /* Album (on met l'url de la radio ...) */ @@ -1089,27 +1103,27 @@ if (radioName != NULL) { padding = (30 - strlen(radioName)); if (padding < 0) { - (void) snprintf(relativePointer, 31, "%s", radioName); + snprintf(relativePointer, 31, "%s", radioName); } else { - (void) sprintf(relativePointer, "%s", radioName); - (void) memset(relativePointer + (30-padding), 0, padding); + sprintf(relativePointer, "%s", radioName); + memset(relativePointer + (30-padding), 0, padding); } } else { - (void) memset(relativePointer, 0, 30); + memset(relativePointer, 0, 30); } /* Year */ relativePointer = relativePointer + 30; /* 93 octets */ - (void) memset(relativePointer, 0, 4); + memset(relativePointer, 0, 4); /* Comment */ relativePointer = relativePointer + 4; /* 97 octets */ - (void) snprintf(relativePointer, 31, "by cPige http://ed.zehome.com/"); + snprintf(relativePointer, 31, "by cPige http://ed.zehome.com/"); /* Ouah la chance, ça rentre! */ /* genre */ relativePointer = relativePointer + 30; /* 127 octets */ - (void) memset(relativePointer, 1, 1); + memset(relativePointer, 1, 1); /* 128 bytes ! We won :) */ return chunk; @@ -1145,13 +1159,13 @@ VERBOSE("Using win32 sockets\n"); WSADATA WSAData; if((res = WSAStartup(MAKEWORD(2,0), &WSAData)) != 0) - (void) printf("Impossible d'initialiser l'API Winsock 2.0\n"); + printf("Impossible d'initialiser l'API Winsock 2.0\n"); #endif VERBOSE("Entring Server_connect\n"); /* on initialise la socket */ - (void) memset(&serverSockAddr, 0, sizeof(serverSockAddr)); + memset(&serverSockAddr, 0, sizeof(serverSockAddr)); VERBOSE("Servername: %s\n", servername); VERBOSE("Port: %d\n", serverport); hostAddr = inet_addr(servername); @@ -1159,15 +1173,15 @@ /* If it is an ip address */ if ((long) hostAddr != (long)-1) { - (void) memcpy(&serverSockAddr.sin_addr, &hostAddr, sizeof(hostAddr)); + memcpy(&serverSockAddr.sin_addr, &hostAddr, sizeof(hostAddr)); } else { serverHostEnt = gethostbyname(servername); if (serverHostEnt == NULL) { - ERROR("Error with gethostbyname. exiting.\n"); + _ERROR("Error with gethostbyname. exiting.\n"); return -1; } - (void) memcpy(&serverSockAddr.sin_addr, serverHostEnt->h_addr, serverHostEnt->h_length); + memcpy(&serverSockAddr.sin_addr, serverHostEnt->h_addr, serverHostEnt->h_length); } serverSockAddr.sin_port = htons(serverport); serverSockAddr.sin_family = AF_INET; /* FIXEME: IPv6 Support ? */ @@ -1175,7 +1189,7 @@ /* creation de la socket */ if ( (server_socket = socket(AF_INET, SOCK_STREAM, 0)) < 0) { - ERROR("Error creating shoutcast socket. Exiting.\n"); + _ERROR("Error creating shoutcast socket. Exiting.\n"); return -2; } @@ -1185,7 +1199,7 @@ /* requete de connexion */ if(connect( server_socket, (struct sockaddr *)&serverSockAddr, sizeof(serverSockAddr)) < 0 ) { - ERROR("Remote host connection failed.\n"); + _ERROR("Remote host connection failed.\n"); return -3; } else { VERBOSE("Connected.\n"); @@ -1200,8 +1214,8 @@ int server_close (int serversocket) { VERBOSE("Closing server connection.\n"); - (void) shutdown(server_socket, 2); - (void) close(server_socket); + shutdown(server_socket, 2); + close(server_socket); server_socket = 0; VERBOSE("Server connection closed.\n"); return -1; @@ -1209,7 +1223,7 @@ void print_credits() { - (void) printf ("cPige %s by Laurent Coustet (c) 2005\n", VERSION); + printf ("cPige %s by Laurent Coustet (c) 2005\n", VERSION); return; } @@ -1218,7 +1232,7 @@ printf ("cPige help. cPige is a Laurent Coustet product.\n"); printf ("For more informations about me and my software\n"); printf ("please visit http://ed.zehome.com/\n\n"); - printf ("Usage: ./cpige -h http://stream.frequence3.net:8000/ -d /home/ed/Pige -l logfile.log\n\n"); + printf ("Usage: ./cpige -h http://stream-hautdebit.frequence3.net:8000/ -d /home/ed/Pige -l logfile.log\n\n"); printf (" -h host to connect to.\n"); printf (" -V show cpige Version.\n"); printf (" -d directory save stream to this directory.\n"); @@ -1229,7 +1243,9 @@ printf (" -l Path to logfile.\n"); printf (" -I [h|m] pige mode will cut on a hour by hour basis or min by min basis.\n"); printf (" -i nb how many \"nb\" hour(s) or minute(s) we should wait before cutting.\n"); +#ifndef WIN32 printf (" -n cPige will append xxxx to file in 'non pige mode', where xxxx is a number.\n"); +#endif /* printf (" -L live mode (takes no argument), save entire file until 401. (not implemented)\n"); */ return; } @@ -1274,7 +1290,7 @@ cmdLine->logFile = "cpige.log"; cmdLine->dir = malloc(3); - strcpy(cmdLine->dir, "./"); + strncpy(cmdLine->dir, "./", 3); for (i = 1; i < argc; i++) { @@ -1284,8 +1300,8 @@ /* from streamripper */ if ((i == (argc-1)) || (argv[i+1][0] == '-')) { - (void) print_help(); - (void) fprintf(stderr, "option %s requires an argument\n", argv[i]); + (void)print_help(); + fprintf(stderr, "option %s requires an argument\n", argv[i]); exit(1); } } @@ -1309,35 +1325,35 @@ case 'd': i++; cmdLine->dir = memory_allocation(strlen(argv[i]) + 1 + 1); - (void) strncpy(cmdLine->dir, argv[i], strlen(argv[i])); + strncpy(cmdLine->dir, argv[i], strlen(argv[i])); if ((argv[i][(strlen(argv[i]))] != '/') && (argv[i][(strlen(argv[i]))] != '\\')) { cmdLine->dir[(strlen(cmdLine->dir))] = '/'; cmdLine->dir[(strlen(cmdLine->dir)+1)] = 0; } break; - +#ifndef WIN32 case 'n': cmdLine->useNumbers = 1; break; - +#endif case 'l': i++; cmdLine->logFile = memory_allocation(strlen(argv[i]) +1); - (void) strncpy(cmdLine->logFile, argv[i], strlen(argv[i])); + strncpy(cmdLine->logFile, argv[i], strlen(argv[i])); break; case 'P': if (cmdLine->live == 1) { - (void) printf("You can't use Live Mode and Pige mode simultaneously.\n"); + printf("You can't use Live Mode and Pige mode simultaneously.\n"); exit(-1); } if (cmdLine->pige == 1) break; cmdLine->pige = 1; - (void) printf("Pige Mode activated.\n"); + printf("Pige Mode activated.\n"); break; case 'q': @@ -1371,7 +1387,7 @@ if (cmdLine->pige != 1) { cmdLine->pige = 1; - (void) printf("Pige Mode activated.\n"); + printf("Pige Mode activated.\n"); } if ( *argv[i] == 'h' || *argv[i] == 'H' ) @@ -1399,7 +1415,7 @@ if (cmdLine->pige != 1) { cmdLine->pige = 1; - (void) printf("Pige Mode activated.\n"); + printf("Pige Mode activated.\n"); } cmdLine->interval = atoi(argv[i]); @@ -1455,6 +1471,8 @@ /* Returns what song number we lastly saved * the stream to */ + +#ifndef WIN32 int getSongs(char *dir) { DIR *dirp; @@ -1496,6 +1514,7 @@ return songs; } +#endif int checkInterval() { @@ -1510,7 +1529,7 @@ ret = 1; } else { ret = 1; - (void) fprintf(stderr, "Intenal Error: intervalType unknown!\n"); + fprintf(stderr, "Intenal Error: intervalType unknown!\n"); } return ret; diff -ru cpige/cpige.h cpige-1.3-new/cpige.h --- cpige/cpige.h Fri Nov 25 09:46:32 2005 +++ cpige-1.3-new/cpige.h Wed Nov 30 05:32:58 2005 @@ -126,7 +126,9 @@ int mustCut(lastCut *cut); int getCloserInterval(int now, int interval); +#ifndef WIN32 int getSongs(char *dir); +#endif stats *cPigeStats; Only in cpige-1.3-new/: cpige.log diff -ru cpige/debug.c cpige-1.3-new/debug.c --- cpige/debug.c Wed Nov 16 07:34:01 2005 +++ cpige-1.3-new/debug.c Wed Nov 30 06:33:56 2005 @@ -35,8 +35,8 @@ now = time(NULL); if (now == (time_t)-1) { - (void) fprintf(stderr, "Can't log line: time() failed.\n"); - (void) perror("time"); + fprintf(stderr, "Can't log line: time() failed.\n"); + perror("time"); return; } @@ -48,7 +48,7 @@ #endif if (curTime == NULL) { - fprintf(stderr, "Can't log line: localtime_r() failed.\n"); + fprintf(stderr, "Can't log line: localtime(_r)() failed.\n"); return; } @@ -62,14 +62,14 @@ sprintf(z_format, "[%.2d:%.2d:%.2d] [DEBUG PRIO %d][File: %s][Line: %d] %s", curTime->tm_hour, curTime->tm_min, curTime->tm_sec, _debug_priority, _debug_filename, _debug_line, _debug_message); #ifndef WIN32 - free(curTime); + (void)free(curTime); #endif vfprintf(_Debug_Output, z_format, ap); fflush(_Debug_Output); - free(z_format); + (void)free(z_format); va_end(ap); return; } diff -ru cpige/debug.h cpige-1.3-new/debug.h --- cpige/debug.h Wed Nov 16 07:34:01 2005 +++ cpige-1.3-new/debug.h Wed Nov 30 06:22:29 2005 @@ -15,7 +15,7 @@ #include -#define DEBUGLEVEL 3 +#define DEBUGLEVEL 1 #define DEBUG_ERR 1 #define DEBUG_MSG 2 @@ -23,7 +23,7 @@ #define DEBUG(priority, ...) _DEBUG(__LINE__, __FILE__, priority, __VA_ARGS__) -#define ERROR(...) DEBUG(DEBUG_ERR, __VA_ARGS__) +#define _ERROR(...) DEBUG(DEBUG_ERR, __VA_ARGS__) #define MESSAGE(...) DEBUG(DEBUG_MSG, __VA_ARGS__) #define VERBOSE(...) DEBUG(DEBUG_ALL, __VA_ARGS__) diff -ru cpige/pool.c cpige-1.3-new/pool.c --- cpige/pool.c Sat Nov 12 05:06:53 2005 +++ cpige-1.3-new/pool.c Wed Nov 30 06:33:31 2005 @@ -32,9 +32,9 @@ if (new->settings == NULL) { - ERROR("Error parsing URL `%s'.\n", url); - free(new->url); - free(new); + _ERROR("Error parsing URL `%s'.\n", url); + (void)free(new->url); + (void)free(new); return pool; } diff -ru cpige/tool.c cpige-1.3-new/tool.c --- cpige/tool.c Sat Nov 12 05:06:53 2005 +++ cpige-1.3-new/tool.c Wed Nov 30 06:33:15 2005 @@ -104,9 +104,9 @@ void printServSettings(serverSettings_t *set) { - (void) printf("host: %s\n", set->serverAddr); - (void) printf("port: %d\n", set->port); - (void) printf("mp: %s\n", set->mountpoint); + printf("host: %s\n", set->serverAddr); + printf("port: %d\n", set->port); + printf("mp: %s\n", set->mountpoint); return; } END K 10 svn:author V 5 lioux K 8 svn:date V 27 2005-12-02T00:19:28.000000Z K 7 svn:log V 36 Remove improper additions to CFLAGS END K 10 svn:author V 3 flz K 8 svn:date V 27 2005-12-02T00:54:59.000000Z K 7 svn:log V 93 - Fix BUILD_DEPENDS after devel/p5-Class-MethodMaker update. Noticed by: pointyhat via kris END K 10 svn:author V 6 marcus K 8 svn:date V 27 2005-12-02T01:41:40.000000Z K 7 svn:log V 20 Update to 2.3.99.3. END K 10 svn:author V 7 linimon K 8 svn:date V 27 2005-12-02T02:05:39.000000Z K 7 svn:log V 65 Reset maintainer per his request. We hope to see him back soon. END K 10 svn:author V 8 deischen K 8 svn:date V 27 2005-12-02T02:12:32.000000Z K 7 svn:log V 81 When using the bootstrap ada distfile, correctly set the path so it picks it up. END K 10 svn:author V 3 jeh K 8 svn:date V 27 2005-12-02T02:15:27.000000Z K 7 svn:log V 19 Update to DAT 4641 END K 10 svn:author V 8 kuriyama K 8 svn:date V 27 2005-12-02T02:15:50.000000Z K 7 svn:log V 127 - Retire devel/p5-Test-Builder-Tester. This module is included in p5-Test-Simple now. Submitted by: leeym PR: ports/87644 END K 10 svn:author V 7 linimon K 8 svn:date V 27 2005-12-02T02:16:53.000000Z K 7 svn:log V 221 Mark setiathome (both versions) and dependent ports for deprecation. The project has now migrated to astro/boinc-setiathome. PR: ports/89525 Submitted by: edwin Approved by: maintainer request to return these to ports@ END K 10 svn:author V 7 linimon K 8 svn:date V 27 2005-12-02T02:28:35.000000Z K 7 svn:log V 36 Add upnp104 to unbreak INDEX build. END K 10 svn:author V 8 kuriyama K 8 svn:date V 27 2005-12-02T02:28:40.000000Z K 7 svn:log V 18 Upgrade to 1.3.2. END K 10 svn:author V 7 linimon K 8 svn:date V 27 2005-12-02T02:29:39.000000Z K 7 svn:log V 19 Add devel/upnp104. END K 10 svn:author V 6 marcus K 8 svn:date V 27 2005-12-02T02:59:09.000000Z K 7 svn:log V 18 Update to 2.12.2. END K 10 svn:author V 4 ahze K 8 svn:date V 27 2005-12-02T03:31:52.000000Z K 7 svn:log V 21 - Mark broken on 4.x END K 10 svn:author V 5 adamw K 8 svn:date V 27 2005-12-02T03:39:43.000000Z K 7 svn:log V 528 Documentation update. Add a blurb at the beginning stating what the file's used for, and add some more comprehensive descriptions to the definable variables. Also, commit a major faux pas and include a functionality change along with the text string changes. Remove the conditional check for adding %D/share/idl to the plist. The check for whether it's necessary wasn't working, but it's a safe assumption that every mozilla port needs that dir added to the plist. This change has been brought to you by ahze and the number n. END K 10 svn:author V 8 kuriyama K 8 svn:date V 27 2005-12-02T03:44:09.000000Z K 7 svn:log V 34 Add my marker. Requested by: dds END K 10 svn:author V 8 kuriyama K 8 svn:date V 27 2005-12-02T03:45:33.000000Z K 7 svn:log V 41 Remove trailing whitespaces in comments. END K 10 svn:author V 5 adamw K 8 svn:date V 27 2005-12-02T03:55:07.000000Z K 7 svn:log V 19 Update to 1.99.10. END K 10 svn:author V 5 kevlo K 8 svn:date V 27 2005-12-02T04:35:57.000000Z K 7 svn:log V 140 Fix checksum mismatch. The author regenerated m4 and configure files, no functional impatc. PR: ports/89543 Submitted by: Toni Schmidbauer END K 10 svn:author V 4 mezz K 8 svn:date V 27 2005-12-02T05:30:01.000000Z K 7 svn:log V 291 Fix all those ports to find libnssckbi.so in the correct place to allow those SSL certificates work again. Somehow, this patch was lost in the big change, so bring it back. Bump PORTREVISION on all of those ports. PR: ports/89796 Reported by: Christoph Moench-Tegeder END K 10 svn:author V 4 ahze K 8 svn:date V 27 2005-12-02T05:44:22.000000Z K 7 svn:log V 121 - Disable svg support on 5.3 and lower to fix build with a gcc bug. Reported by: many Tested by: mark@mkproductions.org END K 10 svn:author V 6 fenner K 8 svn:date V 27 2005-12-02T05:44:57.000000Z K 7 svn:log V 100 kwatch 2.3.3 never made it to the kde servers, so remove 101 bad URLs by removing MASTER_SITE_KDE. END K 10 svn:author V 5 leeym K 8 svn:date V 27 2005-12-02T05:47:35.000000Z K 7 svn:log V 18 - update to 1.2.1 END K 10 svn:author V 5 leeym K 8 svn:date V 27 2005-12-02T05:52:51.000000Z K 7 svn:log V 32 - set CONFLICTS and LATEST_LINK END K 10 svn:author V 5 leeym K 8 svn:date V 27 2005-12-02T05:53:24.000000Z K 7 svn:log V 16 - set CONFLICTS END K 10 svn:author V 5 leeym K 8 svn:date V 27 2005-12-02T05:56:39.000000Z K 7 svn:log V 88 - add PORTREVISION and PORTEPOCH back which are removed accidentally in previous commit END K 10 svn:author V 4 ahze K 8 svn:date V 27 2005-12-02T07:04:09.000000Z K 7 svn:log V 18 - Update to 0.1.1 END K 10 svn:author V 7 vanilla K 8 svn:date V 27 2005-12-02T07:04:48.000000Z K 7 svn:log V 27 Upgrade to latest version. END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T08:11:53.000000Z K 7 svn:log V 89 - Retire devel/p5-Test-Builder-Tester. This module is included in p5-Test-Simple now. END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T09:39:24.000000Z K 7 svn:log V 35 - Update to 0.20 - Rephrase IGNORE END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T09:42:12.000000Z K 7 svn:log V 35 - Update to 0.10 - Rephrase IGNORE END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T10:05:23.000000Z K 7 svn:log V 70 - Update to 3.07 - Reassign to perl@ - Mark for perl 5.6.x or higher. END K 10 svn:author V 3 skv K 8 svn:date V 27 2005-12-02T10:06:31.000000Z K 7 svn:log V 92 Add DomainKeys support. PR: ports/89011 Submitted by: skv Approved by: maintainer timeout END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T10:10:46.000000Z K 7 svn:log V 15 Update to 1.10 END K 10 svn:author V 2 vs K 8 svn:date V 27 2005-12-02T10:51:31.000000Z K 7 svn:log V 49 Unbreak exim-doc-info: Use 'makeinfo' from ports END K 10 svn:author V 3 flz K 8 svn:date V 27 2005-12-02T10:57:19.000000Z K 7 svn:log V 93 - Fix BUILD_DEPENDS after devel/p5-Class-MethodMaker update. Noticed by: pointyhat via kris END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T11:07:55.000000Z K 7 svn:log V 15 Update to 0.37 END K 10 svn:author V 8 lawrance K 8 svn:date V 27 2005-12-02T11:28:06.000000Z K 7 svn:log V 440 - Change the location of racoon configuration files to /usr/local/etc/racoon, bringing it in line with the old security/racoon port and the handbook [1] - Make use of USE_RC_SUBR instead of home-grown substitution and install - Prevent installation of some intermediate sample configuration files PR: ports/89273 [1] Submitted by: Angelo Turetta [1] Approved by: VANHULLEBUS Yvan (maintainer) END K 10 svn:author V 8 lawrance K 8 svn:date V 27 2005-12-02T11:32:37.000000Z K 7 svn:log V 179 - Fix MOVED entry for security/racoon to direct users to security/ipsec-tools - Add an UPDATING entry for ipsec-tools regarding changed configuration file locations for racoon. END K 10 svn:author V 8 vsevolod K 8 svn:date V 27 2005-12-02T11:41:27.000000Z K 7 svn:log V 133 - Update to 2.1.1 - Add sha256 checksum PR: 86451 Submitted by: Denis Shaposhnikov Filippo Natali (maintainer) END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T11:47:59.000000Z K 7 svn:log V 95 - Update to 0.42 - Mark for perl 5.8.x or higher due to its dependency on x11-toolkits/p5-Tk END K 10 svn:author V 8 lawrance K 8 svn:date V 27 2005-12-02T11:55:16.000000Z K 7 svn:log V 106 Unbreak. Rearrange so that DOCFORMAT is defined before use in a .if block. Noticed by: dvl on #bsdports END K 10 svn:author V 8 vsevolod K 8 svn:date V 27 2005-12-02T12:00:34.000000Z K 7 svn:log V 112 - Add conflicts to current plone version PR: 86451 Submitted by: Filippo Natali END K 10 svn:author V 8 vsevolod K 8 svn:date V 27 2005-12-02T12:04:34.000000Z K 7 svn:log V 23 Note www/plone upgrade END K 10 svn:author V 5 novel K 8 svn:date V 27 2005-12-02T12:12:35.000000Z K 7 svn:log V 150 I disabled building of static libs but forgot to remove them from the pkg-plist. Remove it now to fix package build. Reported by: pointyhat via kris END K 10 svn:author V 6 ehaupt K 8 svn:date V 27 2005-12-02T12:36:14.000000Z K 7 svn:log V 92 - Update to 0.95 - Add SHA256 hash PR: 89540 Submitted by: Nicola Vitale END K 10 svn:author V 8 jylefort K 8 svn:date V 27 2005-12-02T12:43:57.000000Z K 7 svn:log V 241 - Chase the linux-gtk2 update by updating to 0.117-1 [1] - Simplify the port by using audio/linux-openal/bsd.linux.mk - Add amd64 to ONLY_FOR_ARCHS - Relayout the Makefile (one tab less between variables and values) Reported by: daichi [1] END K 10 svn:author V 3 flz K 8 svn:date V 27 2005-12-02T12:53:33.000000Z K 7 svn:log V 92 - Add OPTIONS. - Replace WANT_PHP_MOD with WANT_PHP_WEB since roundcube works with CGI too. END K 10 svn:author V 2 vs K 8 svn:date V 27 2005-12-02T13:00:26.000000Z K 7 svn:log V 85 Revamp handling of different TCL-flavours PR: ports/86486 Submitted by: maintainer END K 10 svn:author V 4 mnag K 8 svn:date V 27 2005-12-02T13:05:57.000000Z K 7 svn:log V 134 Fix a small bug in extensions/dcopexport.py Bump PORTREVISION PR: 89819 Submitted by: Danny Pansters (maintainer) END K 10 svn:author V 8 jylefort K 8 svn:date V 27 2005-12-02T13:07:13.000000Z K 7 svn:log V 127 Remove powerpc support, because there is no linuxulator on that arch yet (point raised up by netchild and confirmed by arved). END K 10 svn:author V 3 lth K 8 svn:date V 27 2005-12-02T13:34:30.000000Z K 7 svn:log V 15 Update to 0.67 END K 10 svn:author V 6 ehaupt K 8 svn:date V 27 2005-12-02T13:41:35.000000Z K 7 svn:log V 243 - Update to 1.0.0 - Skip t.lock3 which is prone to run out of retries on busy machines - Revise pkg-descr - Nuke files/patch-tests-nolocalconfig (merged upstream) PR: 89823 Submitted by: Matthias Andree (maintainer) END K 10 svn:author V 8 kuriyama K 8 svn:date V 27 2005-12-02T14:07:53.000000Z K 7 svn:log V 127 - Upgrade to 0.9.0. - Fix building devel/rapidsvn with wxgtk26-unicode (1). Submitted by: Denis Shaposhnikov PR: ports/87649 END K 10 svn:author V 6 ehaupt K 8 svn:date V 27 2005-12-02T15:11:16.000000Z K 7 svn:log V 130 - Update to 0.0.20050501 - Pass maintainership to submitter - Add SHA256 PR: 89826 Submitted by: chinsan END K 10 svn:author V 6 ehaupt K 8 svn:date V 27 2005-12-02T15:44:14.000000Z K 7 svn:log V 138 - Update SHA256 - Pass maintainership to submitter PR: 89839 Submitted by: Gabor Kovesdan Discussed with: mnag END K 10 svn:author V 5 garga K 8 svn:date V 27 2005-12-02T16:08:15.000000Z K 7 svn:log V 146 - Remove WWW line from pkg-descr, since site doesn't exist anymore PR: ports/89850 Submitted by: Jean Milanez Melo END K 10 svn:author V 5 garga K 8 svn:date V 27 2005-12-02T16:17:12.000000Z K 7 svn:log V 134 - Add SHA256 checksum - Pass maintainership to submitter PR: ports/89842 Submitted by: Gabor Kovesdan END K 10 svn:author V 4 mnag K 8 svn:date V 27 2005-12-02T16:19:10.000000Z K 7 svn:log V 113 Update to 2.72 Add SHA256 portlint(1) PR: 89836 Submitted by: Ulrich Spoerlein (maintainer) END K 10 svn:author V 5 aaron K 8 svn:date V 27 2005-12-02T16:34:21.000000Z K 7 svn:log V 113 - update port from v0.20 to v0.21 - 0.21 - Added '@' option to unpackeb at the request of Marc (CPAN bug 15461). END K 10 svn:author V 6 brooks K 8 svn:date V 27 2005-12-02T17:36:15.000000Z K 7 svn:log V 138 Mark unconditionally broken. It's had various problems for ages and I have neither time nor interest in fixing it. Drop maintainership. END K 10 svn:author V 3 jeh K 8 svn:date V 27 2005-12-02T17:37:04.000000Z K 7 svn:log V 19 Update to DAT 4642 END K 10 svn:author V 3 skv K 8 svn:date V 27 2005-12-02T17:37:18.000000Z K 7 svn:log V 81 Update to 2.00 Changes: http://search.cpan.org/src/RRA/podlators-2.00/ChangeLog END K 10 svn:author V 3 skv K 8 svn:date V 27 2005-12-02T17:39:02.000000Z K 7 svn:log V 87 Update to 1.64 Changes: http://search.cpan.org/src/LDS/HTTPD-User-Manage-1.64/Changes END K 10 svn:author V 6 brooks K 8 svn:date V 27 2005-12-02T17:39:32.000000Z K 7 svn:log V 146 Mark broken due to configure errors. Admit I don't have time or interest in fixing the problems with this obsolete port and drop maintainership. END K 10 svn:author V 3 skv K 8 svn:date V 27 2005-12-02T17:40:33.000000Z K 7 svn:log V 85 Update to 1.46 Changes: http://search.cpan.org/src/COSIMO/Device-Modem-1.46/Changes END K 10 svn:author V 5 garga K 8 svn:date V 27 2005-12-02T17:44:28.000000Z K 7 svn:log V 150 - Update 4.1.4 - Add SHA256 - Cleanup - Pass maintainership to submitter PR: ports/89841 Submitted by: Gabor Kovesdan END K 10 svn:author V 3 skv K 8 svn:date V 27 2005-12-02T17:45:54.000000Z K 7 svn:log V 86 Update to 0.62 Changes: http://search.cpan.org/src/MHX/Convert-Binary-C-0.62/Changes END K 10 svn:author V 5 lioux K 8 svn:date V 27 2005-12-02T18:04:07.000000Z K 7 svn:log V 18 Update to 0.6.1.7 END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T18:39:46.000000Z K 7 svn:log V 217 This plugin allows your controller class to dispatch XMLRPC methods from its own class. WWW: http://search.cpan.org/dist/Catalyst-Plugin-XMLRPC/ PR: ports/89844 Submitted by: Lars Balker Rasmussen END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T18:40:00.000000Z K 7 svn:log V 68 p5-Catalyst-Plugin-XMLRPC --> ports/www/p5-Catalyst-Plugin-XMLRPC END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T18:42:42.000000Z K 7 svn:log V 93 Update to 5.61 PR: 89857 Submitted by: Lars Balker Rasmussen (maintainer) END K 10 svn:author V 8 nobutaka K 8 svn:date V 27 2005-12-02T18:46:55.000000Z K 7 svn:log V 98 Add byeoru Korean input module. PR: ports/89388 Submitted by: Sangwoo Shim END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T18:50:13.000000Z K 7 svn:log V 93 Update to 1.36 PR: 89849 Submitted by: Lars Balker Rasmussen (maintainer) END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T19:30:41.000000Z K 7 svn:log V 96 Update to 3.0.6 PR: 89829 Submitted by: Jonathan Noack (maintainer) END K 10 svn:author V 6 olgeni K 8 svn:date V 27 2005-12-02T19:30:53.000000Z K 7 svn:log V 26 Upgrade to version 1.250. END K 10 svn:author V 6 glewis K 8 svn:date V 27 2005-12-02T19:32:17.000000Z K 7 svn:log V 215 . Chase an updated distfile. [1] Although this is only documentation, the changes (fixing of URLs, etc.) were enough for me to bump PORTREVISION. . Add SHA256. Submitted by: Adam Stroud END K 10 svn:author V 6 gerald K 8 svn:date V 27 2005-12-02T19:37:57.000000Z K 7 svn:log V 46 Update to the 20051201 snapshot of GCC 4.0.3. END K 10 svn:author V 4 mnag K 8 svn:date V 27 2005-12-02T19:45:01.000000Z K 7 svn:log V 35 Unbroken ports menu (OPTIONS line) END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T19:52:04.000000Z K 7 svn:log V 93 Update to 0.05 PR: 89846 Submitted by: Lars Balker Rasmussen (maintainer) END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T19:57:13.000000Z K 7 svn:log V 209 Supports mo/po files and Maketext classes under your applications I18N namespace. WWW: http://search.cpan.org/dist/Catalyst-Plugin-I18N/ PR: ports/89845 Submitted by: Lars Balker Rasmussen END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T19:57:27.000000Z K 7 svn:log V 64 p5-Catalyst-Plugin-I18N --> ports/www/p5-Catalyst-Plugin-I18N END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T20:01:57.000000Z K 7 svn:log V 387 ExtUtils::AutoInstall lets module writers to specify a more sophisticated form of dependency information than the PREREQ_PM option offered by ExtUtils::MakeMaker. This module works best with the Module::Install framework, a drop-in replacement for MakeMaker. WWW: http://search.cpan.org/dist/ExtUtils-AutoInstall/ PR: ports/89855 Submitted by: Lars Balker Rasmussen END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T20:02:11.000000Z K 7 svn:log V 66 p5-ExtUtils-AutoInstall --> ports/devel/p5-ExtUtils-AutoInstall END K 10 svn:author V 4 kris K 8 svn:date V 27 2005-12-02T20:37:51.000000Z K 7 svn:log V 89 Reset maintainer: "I don't use FreeBSD at this time". Thanks for your work in the past. END K 10 svn:author V 6 olgeni K 8 svn:date V 27 2005-12-02T20:40:22.000000Z K 7 svn:log V 26 Upgrade to version 1.180. END K 10 svn:author V 3 tdb K 8 svn:date V 27 2005-12-02T20:47:08.000000Z K 7 svn:log V 141 - Update to 0.07 - Add SHA256 checksum PR: 89862 Submitted by: Wesley Shields (maintainer) Approved by: clement (mentor) END K 10 svn:author V 3 tdb K 8 svn:date V 27 2005-12-02T20:50:25.000000Z K 7 svn:log V 180 - Update to 0.37 - Add SHA256 checksum - Use PLIST_FILES instead of pkg-plist PR: 89863 Submitted by: Wesley Shields (maintainer) Approved by: clement (mentor) END K 10 svn:author V 6 barner K 8 svn:date V 27 2005-12-02T21:40:12.000000Z K 7 svn:log V 197 - Re-add p5-bioperl-devel, development version of biology/p5-bioperl (A collection of Perl modules for bioinformatics) PR: ports/89497 Submitted by: Mauricio Herrera Cuadra END K 10 svn:author V 7 linimon K 8 svn:date V 27 2005-12-02T22:08:21.000000Z K 7 svn:log V 106 Reset bouncing maintainer address. Noticed by: Jean Milanez Melo END K 10 svn:author V 6 glewis K 8 svn:date V 27 2005-12-02T22:17:15.000000Z K 7 svn:log V 168 . The patch to use getaddrinfo() #ifdef'ed out too much code. Change that to isReachable() is still available (fixes some JCK tests). Submitted by: Christos Zoulas END K 10 svn:author V 6 glewis K 8 svn:date V 27 2005-12-02T22:24:01.000000Z K 7 svn:log V 593 . "Privatise" the symbols in libzip.so to avoid conflicting with those in the systems libz.so. This conflict broke applications such as Eclipse which is linked with libz.so (via gtk+ I believe). This is a slightly modified version of the submitter's patch. A better solution may be to link with the system's libz.so and remove the JDK's internal zlib code altogether, but I'd like to test that a little more first. Until then this solves the problem. . Bump PORTREVISION since Eclipse seems to be quite widely used. Submitted by: "Arno J. Klaassen" END K 10 svn:author V 5 erwin K 8 svn:date V 27 2005-12-02T22:53:02.000000Z K 7 svn:log V 93 Update to 1.30 PR: 89858 Submitted by: Lars Balker Rasmussen (maintainer) END K 10 svn:author V 6 brooks K 8 svn:date V 27 2005-12-02T23:02:31.000000Z K 7 svn:log V 96 These are actually only broken on 4.x so fix markings. Reported by: kris Pointy hat to: brooks END K 10 svn:author V 6 olgeni K 8 svn:date V 27 2005-12-02T23:25:49.000000Z K 7 svn:log V 30 Upgrade to version 0.95.0630. END K 10 svn:author V 5 edwin K 8 svn:date V 27 2005-12-03T02:18:48.000000Z K 7 svn:log V 90 Fix post-patch target PR: ports/87518 Submitted by: Simun Mikecin END K 10 svn:author V 5 edwin K 8 svn:date V 27 2005-12-03T02:32:49.000000Z K 7 svn:log V 606 [maintainer-update] net-mgmt/nagios: Update to Nagios 2.0.b6 Update net-mgmt/nagios to Nagios 2.0.b6. - Changed license to specifically state GPL version 2 - Minor fixes to sample nagios.cfg config file - Fix for non-US date formats in command CGI - Spec file updates - Include file modifications for C++ event broker modules - Minor event broker changes (addition of timed event "sleep" data) - Added some sanity checks during write of status data for full partitions - Sample web server config file changes - Doc updates PR: ports/89869 Sumitted by: Jarrod Sayers END K 10 svn:author V 5 edwin K 8 svn:date V 27 2005-12-03T03:18:31.000000Z K 7 svn:log V 138 Update port: games/crimson fix WWW Fix WWW on pkg-descr. PR: ports/89854 Submitted by: Jean Milanez Melo END K 10 svn:author V 8 lawrance K 8 svn:date V 27 2005-12-03T03:18:40.000000Z K 7 svn:log V 120 Update to 2005-11-30 snapshot. PR: ports/ports/89816 Submitted by: Juergen Lock (maintainer) END K 10 svn:author V 5 edwin K 8 svn:date V 27 2005-12-03T03:25:25.000000Z K 7 svn:log V 184 Wrong dir in pkg-message The wrong gallerydir is echoed in pkg-message (obviously a copy from gallery 1) PR: ports/89867 Submitted by: Melvyn Sopacua END K 10 svn:author V 5 edwin K 8 svn:date V 27 2005-12-03T03:34:55.000000Z K 7 svn:log V 615 fortune's .dat format change breaks precompiled bible.dat for misc/fortune-mod-bible On Thu Feb 17 18:06:37 2005 UTC, ru submitted a change (1.27) to fortune.c that implements a change to read a new on-disk format of the .dat files. (http://www.freebsd.org/cgi/cvsweb.cgi/src/games/fortune/fortune/fortune.c) This change renders old .dat files incompatible with version of fortune compiled after 2005-02-17. Therefore, the supplied bible.dat file that is supplied with the port no longer works. PR: ports/89811 Submitted by: Doug Poland , Ion-Mihai Tetcu END K 10 svn:author V 4 ache K 8 svn:date V 27 2005-12-03T03:37:22.000000Z K 7 svn:log V 52 Tune for new rc.d convention Submitted by: dougb END K 10 svn:author V 5 edwin K 8 svn:date V 27 2005-12-03T03:37:50.000000Z K 7 svn:log V 55 Add -C to strfile Bump portrevision Add SHA256 thingie END K 10 svn:author V 7 thompsa K 8 svn:date V 27 2005-12-03T03:58:20.000000Z K 7 svn:log V 92 Improve the accuracy of my location so ensure the missile lands on me and not my neighbour. END K 10 svn:author V 4 nork K 8 svn:date V 27 2005-12-03T04:31:08.000000Z K 7 svn:log V 39 Fix build error on 4.x with perl5.005. END K 10 svn:author V 6 glewis K 8 svn:date V 27 2005-12-03T05:27:55.000000Z K 7 svn:log V 17 . Add $FreeBSD$. END K 10 svn:author V 5 dougb K 8 svn:date V 27 2005-12-03T07:57:44.000000Z K 7 svn:log V 48 Fix my suggested patch by making it PLIST_SUB+= END K 10 svn:author V 3 tdb K 8 svn:date V 27 2005-12-03T11:13:40.000000Z K 7 svn:log V 118 - Update to 0.8.3 PR: 89815 Submitted by: Maxwell Krohn (maintainer) Approved by: clement (mentor) END K 10 svn:author V 2 se K 8 svn:date V 27 2005-12-03T11:29:42.000000Z K 7 svn:log V 20 Fix my coordinates. END K 10 svn:author V 6 yoichi K 8 svn:date V 27 2005-12-03T13:47:17.000000Z K 7 svn:log V 187 Update to 20040425 version - include jisx0213.2004-1 font files - change PORTVERSION numbering to be based on release date Use pre-su-install instead of pre-install Add SHA256 checksum END K 10 svn:author V 8 netchild K 8 svn:date V 27 2005-12-03T13:55:04.000000Z K 7 svn:log V 251 - update bash and fileutils - don't remove nsswitch.conf if modified [1] - utilize the new "store GPLed sources" feature [2] - use a master site which carries the files Submitted by: Ulrich Spoerlein [1] Requested by: kris [2] END K 10 svn:author V 8 netchild K 8 svn:date V 27 2005-12-03T14:11:53.000000Z K 7 svn:log V 105 Update to a more recent version of the distfile (is carried by more master sites). Requested by: fenner END K 10 svn:author V 4 mnag K 8 svn:date V 27 2005-12-03T14:28:22.000000Z K 7 svn:log V 23 Update to 2.3-20051202 END K 10 svn:author V 8 netchild K 8 svn:date V 27 2005-12-03T14:45:08.000000Z K 7 svn:log V 325 - update to 1.2.10 - use the fedora legacy site before the rpm mirrors (should speed up the fetch operation) - allow to add SRC RPM's (not used in this port, since it also serves as a framework for other ports which would break then, I hope this will be fixed soon by seperating the framework from this Makefile) END K 10 svn:author V 8 netchild K 8 svn:date V 27 2005-12-03T14:49:37.000000Z K 7 svn:log V 40 - update to 0.2.6 - add the SRC RPM's END K 10 svn:author V 8 netchild K 8 svn:date V 27 2005-12-03T14:53:28.000000Z K 7 svn:log V 41 - update to 0.2.35 - add the SRC RPM's END K 10 svn:author V 8 netchild K 8 svn:date V 27 2005-12-03T14:59:32.000000Z K 7 svn:log V 41 - update to 1.8.17 - add the SRC RPM's END K 10 svn:author V 4 nork K 8 svn:date V 27 2005-12-03T17:07:00.000000Z K 7 svn:log V 183 Really Update to 20051113. Pointed out by: Yu-Shun Wang Pointy hat to: myself Brain-dead: myself Sanity tested by: matusita, nobutaka P.S. Utsudashinou... orz END K 10 svn:author V 6 dinoex K 8 svn:date V 27 2005-12-03T17:35:27.000000Z K 7 svn:log V 49 - improve setup Submitted by: Volodymyr Kostyrko END K 10 svn:author V 6 dinoex K 8 svn:date V 27 2005-12-03T17:36:25.000000Z K 7 svn:log V 21 - update to 10.26.20 END K 10 svn:author V 4 ahze K 8 svn:date V 27 2005-12-03T17:54:57.000000Z K 7 svn:log V 120 - Move .include "${.CURDIR}/../mozilla/Makefile.common" to the bottom so svg works for some people. Pointyhat to: me END K 10 svn:author V 5 demon K 8 svn:date V 27 2005-12-03T18:26:55.000000Z K 7 svn:log V 16 Update to 1.36. END